keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wireless: depend on firmware

Browse Source 
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.
This commit is contained in:
Michael Shigorin 2013-02-21 13:10:03 +04:00
parent 85223fc12a
commit 17736ec40e
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf.d/regular.mk
View File

@ -4,8 +4,7 @@ ifeq (distro,$(IMAGE_CLASS))
# WM base target # WM base target
distro/.regular-base: distro/.base +live +wireless use/live/ru \ 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/live/install use/live/repo use/live/net-eth use/x11/3d-free \
use/firmware/wireless use/efi/signed use/luks \ use/efi/signed use/luks +vmguest use/memtest use/branding
+vmguest use/memtest use/branding
@$(call add,LIVE_LISTS,$(call tags,base regular)) @$(call add,LIVE_LISTS,$(call tags,base regular))
@$(call add,LIVE_LISTS,$(call tags,rescue extra)) @$(call add,LIVE_LISTS,$(call tags,rescue extra))
@$(call add,THE_BRANDING,indexhtml notes alterator) @$(call add,THE_BRANDING,indexhtml notes alterator)

4
conf.d/server.mk
View File

@ -14,10 +14,10 @@ distro/server-mini: distro/.server-base use/server/mini \
@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm) @$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \ 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,STAGE1_KFLAVOUR,std-def)
@$(call set,KFLAVOURS,std-def ovz-el) @$(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,ipset ipt-netflow opendpi pf_ring xtables-addons)
@$(call add,MAIN_KMODULES,drbd83 kvm) @$(call add,MAIN_KMODULES,drbd83 kvm)
@$(call add,BASE_LISTS,ovz-server) @$(call add,BASE_LISTS,ovz-server)

2
features.in/rescue/config.mk
View File

@ -1,5 +1,5 @@
use/rescue: use/stage2 sub/stage2@rescue use/syslinux/sdab.cfg \ 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_feature)
@$(call add,RESCUE_LISTS, openssh \ @$(call add,RESCUE_LISTS, openssh \
$(call tags,(base || extra) && (rescue || network))) $(call tags,(base || extra) && (rescue || network)))

5
features.in/slinux/config.mk
View File

@ -15,7 +15,6 @@ use/slinux: use/x11/xfce use/x11/gdm2.20
@$(call add,THE_LISTS,$(call tags,base l10n)) @$(call add,THE_LISTS,$(call tags,base l10n))
@$(call set,META_VOL_SET,Simply Linux) @$(call set,META_VOL_SET,Simply Linux)
use/slinux/full: use/isohybrid use/slinux use/systemd \ use/slinux/full: use/isohybrid use/slinux use/systemd +wireless \
use/firmware/wireless use/branding/complete \ use/branding/complete use/x11/drm use/x11/3d-proprietary
use/x11/drm use/x11/3d-proprietary
@$(call add,THE_PACKAGES,apt-conf-sisyphus) @$(call add,THE_PACKAGES,apt-conf-sisyphus)

6
features.in/wireless/config.mk
View File

@ -1,6 +1,8 @@
+wireless: use/wireless; @: +wireless: use/wireless/full; @:
use/wireless: use/wireless:
@$(call add_feature) @$(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) @$(call add,THE_PACKAGES,wireless-tools rfkill crda iw)
use/wireless/full: use/wireless use/firmware/wireless; @: