h21/HoralOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "liveinstall: Use kernel-uki-dtbloader kernel on aarch64"

Browse Source 
This reverts commit 87c1935253. It
breaks openQA 'install from a live image then boot' tests.

Fixes: https://pagure.io/fedora-kiwi-descriptions/issue/268
This commit is contained in:
Adam Williamson
2026-02-13 09:36:37 -08:00
parent 87c1935253
commit 1352186134
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/boot.xml
+4 -12
View File
@@ -2,7 +2,6 @@
<profiles> <profiles>
<profile name="BootCore" description="Boot core packages"/> <profile name="BootCore" description="Boot core packages"/>
<profile name="BootCoreUKI" description="Boot core packages for UKI"/> <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"> <profile name="BootDiskCore" description="Boot disk core configuration">
<requires profile="BaseCommon"/> <requires profile="BaseCommon"/>
<requires profile="HardwareCommon"/> <requires profile="HardwareCommon"/>
@@ -82,10 +81,10 @@
</oemconfig> </oemconfig>
</type> </type>
</preferences> </preferences>
<packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI,BootCoreLive"> <packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI">
<package name="grubby"/> <package name="grubby"/>
</packages> </packages>
<packages type="image" patternType="plusRecommended" profiles="BootCore,BootCoreLive"> <packages type="image" patternType="plusRecommended" profiles="BootCore">
<package name="grub2-efi-aa64" arch="aarch64"/> <package name="grub2-efi-aa64" arch="aarch64"/>
<package name="grub2-efi-aa64-modules" arch="aarch64"/> <package name="grub2-efi-aa64-modules" arch="aarch64"/>
<package name="grub2-efi-riscv64" arch="riscv64"/> <package name="grub2-efi-riscv64" arch="riscv64"/>
@@ -102,17 +101,10 @@
<package name="shim-signed-ia32" arch="x86_64"/> <package name="shim-signed-ia32" arch="x86_64"/>
<package name="shim-signed-x64" arch="x86_64"/> <package name="shim-signed-x64" arch="x86_64"/>
<package name="shim-unsigned-riscv64" arch="riscv64"/> <package name="shim-unsigned-riscv64" arch="riscv64"/>
<package name="kernel-core"/>
<package name="systemd-oomd-defaults"/> <package name="systemd-oomd-defaults"/>
<package name="systemd-resolved"/> <package name="systemd-resolved"/>
</packages> </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"> <packages type="image" patternType="plusRecommended" profiles="BootCoreUKI">
<package name="shim-signed-aa64" arch="aarch64"/> <package name="shim-signed-aa64" arch="aarch64"/>
<package name="shim-signed-ia32" arch="x86_64"/> <package name="shim-signed-ia32" arch="x86_64"/>
@@ -124,7 +116,7 @@
<package name="python3-virt-firmware"/> <package name="python3-virt-firmware"/>
<package name="uki-direct"/> <package name="uki-direct"/>
</packages> </packages>
<packages type="iso" patternType="plusRecommended" profiles="BootCore,BootCoreLive"> <packages type="iso" patternType="plusRecommended" profiles="BootCore">
<package name="grub2-efi-aa64-cdboot" arch="aarch64"/> <package name="grub2-efi-aa64-cdboot" arch="aarch64"/>
<package name="grub2-efi-riscv64-cdboot" arch="riscv64"/> <package name="grub2-efi-riscv64-cdboot" arch="riscv64"/>
<package name="grub2-efi-ia32-cdboot" arch="x86_64"/> <package name="grub2-efi-ia32-cdboot" arch="x86_64"/>
components/liveinstall.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<profiles> <profiles>
<profile name="LiveInstall" description="Live Install ISO"> <profile name="LiveInstall" description="Live Install ISO">
<requires profile="BaseCommon"/> <requires profile="BaseCommon"/>
<requires profile="BootCoreLive"/> <requires profile="BootCore"/>
</profile> </profile>
</profiles> </profiles>
<preferences profiles="LiveInstall" arch="x86_64"> <preferences profiles="LiveInstall" arch="x86_64">