Skip to content

M
mkimage-profiles
Commit 23f9309a authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

firmware, kernel, wireless: fixup interdeps

It's unreasonable for firmware to depend on kernel, the features should go in the other way around.
parent fe3fb88f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
features.in/firmware/config.mk
View file @ 23f9309a
...@@ -26,8 +26,7 @@ use/firmware/qlogic: use/firmware ...@@ -26,8 +26,7 @@ use/firmware/qlogic: use/firmware
# NB: individual firmwarez would sometimes conflict # NB: individual firmwarez would sometimes conflict
# with ones newly merged into firmware-linux # with ones newly merged into firmware-linux
# FIXME: kernel modules rather belong to use/hardware use/firmware/wireless: use/firmware
use/firmware/wireless: use/firmware use/kernel/wireless
@$(call add,THE_PACKAGES,firmware-acx100) @$(call add,THE_PACKAGES,firmware-acx100)
@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*) @$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*) @$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
......
features.in/kernel/config.mk
View file @ 23f9309a
...@@ -14,5 +14,5 @@ use/kernel/net: ...@@ -14,5 +14,5 @@ use/kernel/net:
@$(call add,THE_KMODULES,e1000e igb) @$(call add,THE_KMODULES,e1000e igb)
@$(call add,MAIN_KMODULES,r8168 rtl8168) @$(call add,MAIN_KMODULES,r8168 rtl8168)
use/kernel/wireless: use/kernel/wireless: use/firmware/wireless
@$(call add,THE_KMODULES,bcmwl ndiswrapper) @$(call add,THE_KMODULES,bcmwl ndiswrapper)
features.in/wireless/config.mk
View file @ 23f9309a
...@@ -5,5 +5,5 @@ use/wireless: ...@@ -5,5 +5,5 @@ use/wireless:
@$(call add,THE_KMODULES,bcmwl rt3070 rtl8192 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; @: use/wireless/full: use/wireless use/kernel/wireless; @:
@$(call add,RESCUE_PACKAGES,wireless-tools rfkill crda iw) @$(call add,RESCUE_PACKAGES,wireless-tools rfkill crda iw)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment