[Karmic] Let nic-shared-modules depends on crypto-modules

[Tim Gardner]

Ike Panhc wrote:
> Sorry for last mail, I forget to add Subject before sending.
> 
>> Description
> Bug 360966 request to have bnx2x module in the installer. I have sent the patch
> for add the firmware, kernel module and libcrc32c for dependence, but I did not
> notice when libcrc32c initial, it will call request_module() to load crc32c.ko
> 
> Bug reporter reports that bnx2x needs crc32c.ko to work, and it is already in
> the crypto-modules, the simplest way to solve is let the nic-shared-modules
> depends on crypto-modules.
> 
>> Request-pull
> The following changes since commit 8cc00dba85d31a342be634160257f81304cee8fd:
>   Leann Ogasawara (1):
>         UBUNTU: [Upstream] (drop after 2.6.31) drm/i915: increase default latency constant
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/ikepanhc/ike-karmic.git lp#360966_2
> 
> Ike Panhc (1):
>       UBUNTU: [Config] Let nic-shared-modules depends on crypto-modules
> 
>  debian.master/d-i/package-list |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
> 
>> Patch
> From d20542edf9af20244b02d8b760273ec7ab95f6d1 Mon Sep 17 00:00:00 2001
> From: Ike Panhc <ike.pan at canonical.com>
> Date: Wed, 26 Aug 2009 11:24:41 +0800
> Subject: [PATCH] UBUNTU: [Config] Let nic-shared-modules depends on crypto-modules
> 
> BugLink: http://bugs.launchpad.net/bugs/360966
> 
> The bnx2x modules depends on libcrc32c.ko, and libcrc32c.ko requests crc32c.ko
> when initial.
> 
> Since the crypto-module contains crc32c.ko. I think the best way to solve this
> issue is let the nic-shared-modules depends on crypto-modules.
> 
> Signed-off-by: Ike Panhc <ike.pan at canonical.com>
> ---
>  debian.master/d-i/package-list |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/debian.master/d-i/package-list b/debian.master/d-i/package-list
> index a8f1c46..f847869 100644
> --- a/debian.master/d-i/package-list
> +++ b/debian.master/d-i/package-list
> @@ -65,6 +65,12 @@ Depends: kernel-image, nic-shared-modules, usb-modules
>  Priority: standard
>  Description: USB network interface support
>  
> +Package: nic-shared-modules
> +Depends: kernel-image, crypto-modules
> +Priority: standard
> +Description: nic shared modules
> +  This package contains modules which support nic modules
> +
>  Package: parport-modules
>  Depends: kernel-image
>  Priority: standard

applied

-- 
Tim Gardner tim.gardner at canonical.com