From patchwork Mon Jun 11 15:55:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 164224 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 1BB5F1008CC for ; Tue, 12 Jun 2012 01:55:53 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Se6y0-00071M-IJ; Mon, 11 Jun 2012 15:55:44 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Se6xz-00071F-HQ for kernel-team@lists.ubuntu.com; Mon, 11 Jun 2012 15:55:43 +0000 Received: from p5b2e3b27.dip.t-dialin.net ([91.46.59.39] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Se6xz-00059E-Bb for kernel-team@lists.ubuntu.com; Mon, 11 Jun 2012 15:55:43 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: (config) Move dependency on crda to extra package Date: Mon, 11 Jun 2012 17:55:41 +0200 Message-Id: <1339430141-20745-1-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <20120611145317.GB29163@thinkpad-t410> References: <20120611145317.GB29163@thinkpad-t410> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com With the split between linux-image and linux-image-extra, all wireless modules are in the extra package. Only some base libraries were still in the main package. Move those into extra and also move the dependency on crda/wireless-tools to that. That way the linux-image package which is used by the virtual meta-package does not automatically pull in crda. BugLink: http://bugs.launchpad.net/bugs/657901 [v2: move net/mac80211 into extra as well based on Seth's feedback] Signed-off-by: Stefan Bader --- debian.master/control.d/flavour-control.stub | 4 ++-- debian.master/control.d/generic.inclusion-list | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub index d01b03a..b5403ce 100644 --- a/debian.master/control.d/flavour-control.stub +++ b/debian.master/control.d/flavour-control.stub @@ -27,7 +27,7 @@ Section: kernel Priority: optional Pre-Depends: dpkg (>= 1.10.24) Provides: linux-image, linux-image-3.0, fuse-module, =PROVIDES= -Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3), crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: BOOTLOADER Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools @@ -51,7 +51,7 @@ Package: linux-image-extra-PKGVER-ABINUM-FLAVOUR Architecture: ARCH Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel image for version PKGVER on DESC This package contains the Linux kernel image for version PKGVER on DESC. diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list index 81df862..edf93b2 100644 --- a/debian.master/control.d/generic.inclusion-list +++ b/debian.master/control.d/generic.inclusion-list @@ -117,7 +117,6 @@ net/irda/* net/key/* net/lapb/* net/llc/* -net/mac80211/* net/netfilter/* net/netrom/* net/phonet/* @@ -127,7 +126,6 @@ net/sched/* net/sctp/* net/tipc/* net/wanrouter/* -net/wireless/* net/x25/* net/xfrm/* net/sunrpc/auth_gss/auth_rpcgss.ko