firmware, kernel, wireless: fixup interdeps

It's unreasonable for firmware to depend on kernel,
the features should go in the other way around.
This commit is contained in:
Michael Shigorin 2016-03-23 11:58:44 +03:00
parent fe3fb88ff6
commit 23f9309aa2
3 changed files with 3 additions and 4 deletions

View File

@ -26,8 +26,7 @@ use/firmware/qlogic: use/firmware
# NB: individual firmwarez would sometimes conflict
# with ones newly merged into firmware-linux
# FIXME: kernel modules rather belong to use/hardware
use/firmware/wireless: use/firmware use/kernel/wireless
use/firmware/wireless: use/firmware
@$(call add,THE_PACKAGES,firmware-acx100)
@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)

View File

@ -14,5 +14,5 @@ use/kernel/net:
@$(call add,THE_KMODULES,e1000e igb)
@$(call add,MAIN_KMODULES,r8168 rtl8168)
use/kernel/wireless:
use/kernel/wireless: use/firmware/wireless
@$(call add,THE_KMODULES,bcmwl ndiswrapper)

View File

@ -5,5 +5,5 @@ use/wireless:
@$(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; @:
use/wireless/full: use/wireless use/kernel/wireless; @:
@$(call add,RESCUE_PACKAGES,wireless-tools rfkill crda iw)