From patchwork Mon Jun 11 14:24:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC,Quantal] Move dependncy on crda/wireless Date: Mon, 11 Jun 2012 04:24:53 -0000 From: Stefan Bader X-Patchwork-Id: 164136 Message-Id: <1339424693-16841-1-git-send-email-stefan.bader@canonical.com> To: kernel-team@lists.ubuntu.com Since introducing the split of having linux-image with a limited number of modules and linux-image-extra containing all those not in that, most wireless modules are now in the extra package. The only remaining are some libraries under net/wireless which probably could move as well. Then the dependency on crda could actually move from the main package to the extra package. And that way a virtual installation (which only pulls in the main package) would not install the crda package (as some long standing bug asks for). I made the following change against quantal-next. It compiles and on a quick check seems to put things into the places I intendend them to be. The installer should be unaffected as the udebs are pulling modules based on their own lists. And I was told the live image pulls in both kernel packages. If that looks sensible and works, I suppose a similar change could be made for the virtual flavour in Precise. -Stefan >From 65a43fe525669b8604b50a00f04d2ddd10df6302 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Mon, 11 Jun 2012 13:44:50 +0200 Subject: [PATCH] UBUNTU: (config) Move dependency on crda to extra package 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 Signed-off-by: Stefan Bader --- debian.master/control.d/flavour-control.stub | 4 ++-- debian.master/control.d/generic.inclusion-list | 1 - 2 files changed, 2 insertions(+), 3 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..57327fb 100644 --- a/debian.master/control.d/generic.inclusion-list +++ b/debian.master/control.d/generic.inclusion-list @@ -127,7 +127,6 @@ net/sched/* net/sctp/* net/tipc/* net/wanrouter/* -net/wireless/* net/x25/* net/xfrm/* net/sunrpc/auth_gss/auth_rpcgss.ko