From 1352186134b203ee2ed07728e2e246761005c891 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 13 Feb 2026 09:36:11 -0800
Subject: [PATCH] Revert "liveinstall: Use kernel-uki-dtbloader kernel on
 aarch64"

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

Fixes: https://pagure.io/fedora-kiwi-descriptions/issue/268
---
 components/boot.xml        | 16 ++++------------
 components/liveinstall.xml |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/components/boot.xml b/components/boot.xml
index c251e7f..59bd862 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -2,7 +2,6 @@
 	<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"/>
@@ -82,10 +81,10 @@
 			</oemconfig>
 		</type>
 	</preferences>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI,BootCoreLive">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI">
 		<package name="grubby"/>
 	</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-modules" arch="aarch64"/>
 		<package name="grub2-efi-riscv64" arch="riscv64"/>
@@ -102,17 +101,10 @@
 		<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"/>
@@ -124,7 +116,7 @@
 		<package name="python3-virt-firmware"/>
 		<package name="uki-direct"/>
 	</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-riscv64-cdboot" arch="riscv64"/>
 		<package name="grub2-efi-ia32-cdboot" arch="x86_64"/>
diff --git a/components/liveinstall.xml b/components/liveinstall.xml
index c324769..4ba9bfd 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="BootCoreLive"/>
+			<requires profile="BootCore"/>
 		</profile>
 	</profiles>
 	<preferences profiles="LiveInstall" arch="x86_64">