firmware: mv {MAIN,THE}_PACKAGES

THE_PACKAGES_REGEXP is in place, let's rebase firmware packages
so these would be available in LiveCDs either.

The news for systems being installed is that MAIN_* is optional
while THE_* is included in base system; firmware packages tend
to be pretty tiny and harmless.

kernel-wifi pkglist has absolutely no sense by now, hence purged;
firmware-rt* and firmware-i2400m are merged into firmware-linux.
This commit is contained in:
Michael Shigorin 2012-04-10 19:29:32 +04:00
parent 86c42e2db6
commit 865f4c7614
2 changed files with 12 additions and 9 deletions

View File

@ -7,13 +7,17 @@ use/firmware:
use/firmware/server: use/firmware use/firmware/server: use/firmware
@$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq) @$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq)
@$(call add,MAIN_PACKAGES_REGEXP,firmware-ql.*) @$(call add,THE_PACKAGES_REGEXP,firmware-ql.*)
# NB: individual firmwarez would sometimes conflict
# with ones newly merged into firmware-linux
use/firmware/wireless: use/firmware use/firmware/wireless: use/firmware
@$(call add,MAIN_PACKAGES,firmware-acx100) @$(call add,THE_KMODULES,bcmwl ndiswrapper)
@$(call add,MAIN_PACKAGES,firmware-i2400m) @$(call add,THE_PACKAGES,firmware-acx100)
@$(call add,MAIN_PACKAGES_REGEXP,firmware-carl9170.*) @#$(call add,THE_PACKAGES,firmware-i2400m)
@$(call add,MAIN_PACKAGES_REGEXP,firmware-ipw.*) @$(call add,THE_PACKAGES_REGEXP,firmware-carl9170.*)
@#$(call add,MAIN_PACKAGES_REGEXP,firmware-iwl.*) @$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
@$(call add,MAIN_PACKAGES_REGEXP,firmware-rt.*) @$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
@$(call add,MAIN_PACKAGES_REGEXP,firmware-zd.*) @#$(call add,THE_PACKAGES_REGEXP,firmware-iwl.*)
@#$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)

View File

@ -1 +0,0 @@
firmware-rt73