wireless: depend on firmware

Richard and Theo would probably roll their eyes at this point but the unfortunate reality is that wireless hardware is very much dependent on firmware being explicitly provided; so here it is. rtl8192 kernel module added since it's present in t6/branch at least.

wireless: depend on firmware
17736ec4 · Michael Shigorin · 85223fc1 · 17736ec4 · 17736ec4 · 17736ec4
Commit 17736ec4 authored Feb 21, 2013 by Michael Shigorin
Showing with 10 additions and 10 deletions

regular.mk conf.d/regular.mk +1 -2

server.mk conf.d/server.mk +2 -2

config.mk features.in/rescue/config.mk +1 -1

config.mk features.in/slinux/config.mk +2 -3

config.mk features.in/wireless/config.mk +4 -2

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -4,8 +4,7 @@ ifeq (distro,$(IMAGE_CLASS))
 # WM base target
 distro/.regular-base: distro/.base +live +wireless use/live/ru \
 	use/live/install use/live/repo use/live/net-eth use/x11/3d-free \
-	use/firmware/wireless use/efi/signed use/luks \
-	+vmguest use/memtest use/branding
+	use/efi/signed use/luks +vmguest use/memtest use/branding
 	@$(call add,LIVE_LISTS,$(call tags,base regular))
 	@$(call add,LIVE_LISTS,$(call tags,rescue extra))
 	@$(call add,THE_BRANDING,indexhtml notes alterator)

--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -14,10 +14,10 @@ distro/server-mini: distro/.server-base use/server/mini \
 	@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)

 distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
-	use/firmware/server use/firmware/wireless use/power/acpi/button
+	use/firmware/server use/power/acpi/button +wireless
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)
-	@$(call add,BASE_KMODULES,rtl8168 rtl8192)
+	@$(call add,BASE_KMODULES,rtl8168)
 	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons)
 	@$(call add,MAIN_KMODULES,drbd83 kvm)
 	@$(call add,BASE_LISTS,ovz-server)

--- a/features.in/rescue/config.mk
+++ b/features.in/rescue/config.mk
 use/rescue: use/stage2 sub/stage2@rescue use/syslinux/sdab.cfg \
-	use/firmware/server use/firmware/wireless
+	use/firmware/server +wireless
 	@$(call add_feature)
 	@$(call add,RESCUE_LISTS, openssh \
 		$(call tags,(base || extra) && (rescue || network)))
--- a/features.in/slinux/config.mk
+++ b/features.in/slinux/config.mk
@@ -15,7 +15,6 @@ use/slinux: use/x11/xfce use/x11/gdm2.20
 	@$(call add,THE_LISTS,$(call tags,base l10n))
 	@$(call set,META_VOL_SET,Simply Linux)

-use/slinux/full: use/isohybrid use/slinux use/systemd \
-	use/firmware/wireless use/branding/complete \
-	use/x11/drm use/x11/3d-proprietary
+use/slinux/full: use/isohybrid use/slinux use/systemd +wireless \
+	use/branding/complete use/x11/drm use/x11/3d-proprietary
 	@$(call add,THE_PACKAGES,apt-conf-sisyphus)
--- a/features.in/wireless/config.mk
+++ b/features.in/wireless/config.mk
-+wireless: use/wireless; @:
+wireless: use/wireless/full; @:

 use/wireless:
 	@$(call add_feature)
-	@$(call add,THE_KMODULES,bcmwl rt3070 staging)
+	@$(call add,THE_KMODULES,bcmwl rt3070 rtl8192 staging)
 	@$(call add,THE_PACKAGES,wireless-tools rfkill crda iw)
+
+use/wireless/full: use/wireless use/firmware/wireless; @: