[PATCH] UBUNTU: Ship bnx2x firmware in nic-modules udeb

[Colin Watson]

On Fri, Jul 17, 2009 at 07:39:54PM +0800, Ike Panhc wrote:
> diff --git a/debian/d-i/firmware/nic-modules b/debian/d-i/firmware/nic-modules
> index 27f89a6..ffa835b 100644
> --- a/debian/d-i/firmware/nic-modules
> +++ b/debian/d-i/firmware/nic-modules
> @@ -2,3 +2,5 @@ bnx2/bnx2-mips-06-4.6.16.fw ?
>  bnx2/bnx2-mips-09-4.6.17.fw ?
>  bnx2/bnx2-rv2p-06-4.6.16.fw ?
>  bnx2/bnx2-rv2p-09-4.6.15.fw ?
> +bnx2x-e1-4.8.53.0.fw ?
> +bnx2x-e1h-4.8.53.0.fw ?
> diff --git a/debian/d-i/modules/nic-modules b/debian/d-i/modules/nic-modules
> index 450fc01..e475e48 100644
> --- a/debian/d-i/modules/nic-modules
> +++ b/debian/d-i/modules/nic-modules
> @@ -33,6 +33,7 @@ bcm43xx ?
>  bcm43xx-mac80211 ?
>  bmac ?
>  bnx2 ?
> +bnx2x ?
>  bonding ?
>  cassini ?
>  com20020 ?

This part looks right.

> diff --git a/debian/d-i/modules/nic-shared-modules b/debian/d-i/modules/nic-shared-modules
> index 96d84b6..ccc1107 100644
> --- a/debian/d-i/modules/nic-shared-modules
> +++ b/debian/d-i/modules/nic-shared-modules
> @@ -5,6 +5,7 @@ mii
>  # CRC modules
>  crc-ccitt
>  crc-itu-t
> +libcrc32c
>  
>  # mac80211 stuff
>  mac80211

This will (I expect) fail to build, as the libcrc32c module will be in
both nic-shared-modules and crypto-modules and kernel-wedge rightly
won't let you do that. The fix is to edit debian/d-i/package-list,
either to add nic-shared-modules to crypto-modules' Depends or to add a
new nic-shared-modules stanza that Depends: kernel-image,
crypto-modules. The latter is conceptually more elegant but would grow
the netboot image, while the former is a bit of a hack but is easier to
implement and won't make any installer images grow since crypto-modules
is only loaded later. I'd recommend the former for now.

diff --git a/debian/d-i/package-list b/debian/d-i/package-list
index b156157..382271a 100644
--- a/debian/d-i/package-list
+++ b/debian/d-i/package-list
@@ -147,7 +147,7 @@ Description: Fusion and i2o storage modules
 
 Package: crypto-modules
 Priority: extra
-Depends: kernel-image
+Depends: kernel-image, nic-shared-modules
 Description: crypto modules
  This package contains crypto modules.
 

-- 
Colin Watson                                       [cjwatson at ubuntu.com]