diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 92a8fd71..f4f6b716 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -14,7 +14,7 @@ distro/.regular-base: distro/.base +live +wireless use/live/ru \ # DE base target # TODO: use/plymouth/live when luks+plymouth is done, see also #28255 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,THE_BRANDING,bootloader) @$(call set,KFLAVOURS,std-def) diff --git a/conf.d/server.mk b/conf.d/server.mk index 83fd0dc6..db54d7ca 100644 --- a/conf.d/server.mk +++ b/conf.d/server.mk @@ -14,7 +14,7 @@ distro/server-mini: distro/.server-base use/server/mini \ @$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm) 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,KFLAVOURS,std-def ovz-el) @$(call add,BASE_KMODULES,rtl8168) diff --git a/features.in/firmware/config.mk b/features.in/firmware/config.mk index f4c63885..4ebe2075 100644 --- a/features.in/firmware/config.mk +++ b/features.in/firmware/config.mk @@ -5,6 +5,8 @@ use/firmware: @$(call add_feature) @$(call add,SYSTEM_PACKAGES,firmware-linux) + +use/firmware/cpu: use/firmware @$(call add,THE_PACKAGES,firmware-amd-ucode) @$(call add,THE_PACKAGES,microcode-data-intel microcode_ctl)