liveinstall: Use kernel-uki-dtbloader kernel on aarch64
For aarch64 liveinstall images we want to replace the kernel-core package with kernel-uki-dtbloader for: https://fedoraproject.org/wiki/Changes/Automatic_DTB_selection_for_aarch64_EFI_systems This is implemented by: 1. Adding a new BootCoreLive profile which is the same as the BootCore profile and re-uses most of the description. Rreplacing the kernel-core package with kernel-uki-dtbloader on aarch64. 2. Switch the LiveInstall from the BootCore profile to the BootCoreLive profile. Signed-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com>
This commit is contained in:
+12
-4
@@ -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"/>
|
||||
|
||||
@@ -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">
|
||||
|
||||
Reference in New Issue
Block a user