firmware: factored out cpu ucode

Let's make CPU microcode an explicit target, it isn't
required at every host where firmware-linux is.

Adjusted its use accordingly.
This commit is contained in:
Michael Shigorin 2013-02-21 13:34:05 +04:00
parent 17736ec40e
commit a903457e65
3 changed files with 4 additions and 2 deletions

View File

@ -14,7 +14,7 @@ distro/.regular-base: distro/.base +live +wireless use/live/ru \
# DE base target # DE base target
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255 # TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.regular-base \ distro/.regular-desktop: distro/.regular-base \
use/systemd use/syslinux/ui/gfxboot use/efi/refind use/systemd use/syslinux/ui/gfxboot use/firmware/cpu use/efi/refind
@$(call add,LIVE_LISTS,domain-client) @$(call add,LIVE_LISTS,domain-client)
@$(call add,THE_BRANDING,bootloader) @$(call add,THE_BRANDING,bootloader)
@$(call set,KFLAVOURS,std-def) @$(call set,KFLAVOURS,std-def)

View File

@ -14,7 +14,7 @@ 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/power/acpi/button +wireless use/firmware/server use/firmware/cpu 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) @$(call add,BASE_KMODULES,rtl8168)

View File

@ -5,6 +5,8 @@
use/firmware: use/firmware:
@$(call add_feature) @$(call add_feature)
@$(call add,SYSTEM_PACKAGES,firmware-linux) @$(call add,SYSTEM_PACKAGES,firmware-linux)
use/firmware/cpu: use/firmware
@$(call add,THE_PACKAGES,firmware-amd-ucode) @$(call add,THE_PACKAGES,firmware-amd-ucode)
@$(call add,THE_PACKAGES,microcode-data-intel microcode_ctl) @$(call add,THE_PACKAGES,microcode-data-intel microcode_ctl)