diff options
| -rw-r--r-- | components/boot.xml | 16 | ||||
| -rw-r--r-- | components/liveinstall.xml | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/components/boot.xml b/components/boot.xml index 59bd862..c251e7f 100644 --- a/components/boot.xml +++ b/components/boot.xml @@ -2,6 +2,7 @@ <profiles> <profile name="BootCore" description="Boot core packages"/> <profile name="BootCoreUKI" description="Boot core packages for UKI"/> + <profile name="BootCoreLive" description="Boot core packages for Live DVDs"/> <profile name="BootDiskCore" description="Boot disk core configuration"> <requires profile="BaseCommon"/> <requires profile="HardwareCommon"/> @@ -81,10 +82,10 @@ </oemconfig> </type> </preferences> - <packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI"> + <packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI,BootCoreLive"> <package name="grubby"/> </packages> - <packages type="image" patternType="plusRecommended" profiles="BootCore"> + <packages type="image" patternType="plusRecommended" profiles="BootCore,BootCoreLive"> <package name="grub2-efi-aa64" arch="aarch64"/> <package name="grub2-efi-aa64-modules" arch="aarch64"/> <package name="grub2-efi-riscv64" arch="riscv64"/> @@ -101,10 +102,17 @@ <package name="shim-signed-ia32" arch="x86_64"/> <package name="shim-signed-x64" arch="x86_64"/> <package name="shim-unsigned-riscv64" arch="riscv64"/> - <package name="kernel-core"/> <package name="systemd-oomd-defaults"/> <package name="systemd-resolved"/> </packages> + <packages type="image" patternType="plusRecommended" profiles="BootCore"> + <package name="kernel-core"/> + </packages> + <packages type="image" patternType="plusRecommended" profiles="BootCoreLive"> + <!-- Use kernel-uki-dtbloader for aarch64 --> + <package name="kernel-core" arch="x86_64,riscv64,ppc64le,s390x"/> + <package name="kernel-uki-dtbloader" arch="aarch64"/> + </packages> <packages type="image" patternType="plusRecommended" profiles="BootCoreUKI"> <package name="shim-signed-aa64" arch="aarch64"/> <package name="shim-signed-ia32" arch="x86_64"/> @@ -116,7 +124,7 @@ <package name="python3-virt-firmware"/> <package name="uki-direct"/> </packages> - <packages type="iso" patternType="plusRecommended" profiles="BootCore"> + <packages type="iso" patternType="plusRecommended" profiles="BootCore,BootCoreLive"> <package name="grub2-efi-aa64-cdboot" arch="aarch64"/> <package name="grub2-efi-riscv64-cdboot" arch="riscv64"/> <package name="grub2-efi-ia32-cdboot" arch="x86_64"/> diff --git a/components/liveinstall.xml b/components/liveinstall.xml index 4ba9bfd..c324769 100644 --- a/components/liveinstall.xml +++ b/components/liveinstall.xml @@ -2,7 +2,7 @@ <profiles> <profile name="LiveInstall" description="Live Install ISO"> <requires profile="BaseCommon"/> - <requires profile="BootCore"/> + <requires profile="BootCoreLive"/> </profile> </profiles> <preferences profiles="LiveInstall" arch="x86_64"> |