Message ID | 1339424693-16841-1-git-send-email-stefan.bader@canonical.com |
---|---|
State | New |
Headers | show |
On Mon, Jun 11, 2012 at 04:24:53PM +0200, Stefan Bader wrote: > 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). This seems reasonable to me. Afaict no wireless drivers are included in the main package anyway, so I don't really see a point in including the core wireless support there. One comment on the particulars however ... > 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/* You can probably also remove net/mac80211/*, as it is also exlusively related to wireless driver functionality. Seth
On 11.06.2012 16:53, Seth Forshee wrote: > On Mon, Jun 11, 2012 at 04:24:53PM +0200, Stefan Bader wrote: >> 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). > > This seems reasonable to me. Afaict no wireless drivers are included in > the main package anyway, so I don't really see a point in including the > core wireless support there. > > One comment on the particulars however ... > >> 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/* > > You can probably also remove net/mac80211/*, as it is also exlusively > related to wireless driver functionality. > Oh, right. I missed that while looking for wireless only. Let me update that patch... Thanks, Stefan > Seth >
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