From 726d50088f8e42a94e4e11560266d10792b4e43d Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Apr 09 2024 02:46:36 +0000
Subject: [PATCH 1/5] Install fedora-release-* at bootstrap phase for various images


This ensures that the correct variant packages are installed.

---

diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml
index 828a187..137449c 100644
--- a/components/desktop-environments.xml
+++ b/components/desktop-environments.xml
@@ -28,16 +28,20 @@
 	<packages type="uninstall" profiles="DesktopCommon">
 		<package name="xorg-x11-server-Xorg"/>
 	</packages>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="GNOME-Desktop">
+		<package name="fedora-release-workstation"/>
+	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop">
 		<namedCollection name="workstation-product-environment"/>
-		<package name="fedora-release-workstation"/>
+	</packages>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="KDE-Desktop">
+		<package name="fedora-release-kde"/>
 	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="KDE-Desktop">
 		<namedCollection name="kde-desktop-environment"/>
 		<namedCollection name="kde-apps"/>
 		<namedCollection name="kde-media"/>
 		<package name="fuse"/>
-		<package name="fedora-release-kde"/>
 		<package name="kde-l10n"/>
 		<package name="calamares-firstboot-config"/>
 		<ignore name="@admin-tools"/>
diff --git a/platforms/server.xml b/platforms/server.xml
index 33b53cf..c91c287 100644
--- a/platforms/server.xml
+++ b/platforms/server.xml
@@ -18,9 +18,11 @@
 			</oemconfig>
 		</type>
 	</preferences>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Server">
+		<package name="fedora-release-server"/>
+	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="Server">
 		<namedCollection name="container-management"/>
 		<namedCollection name="server-product-environment"/>
-		<package name="fedora-release-server"/>
 	</packages>
 </image>

From 84a2a2a187dc6e18eb932b44afb1ce05064c64c0 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Apr 09 2024 02:48:27 +0000
Subject: [PATCH 2/5] components/boot: Force grubby at bootstrap phase


If no preference is expressed, sdubby will be selected instead of
grubby, which breaks image builds. Thus, install grubby early to
avoid this issue.

---

diff --git a/components/boot.xml b/components/boot.xml
index f835e4f..939dad0 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -2,13 +2,15 @@
 	<profiles>
 		<profile name="BootCore" description="Boot core packages"/>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="BootCore">
+		<package name="grubby"/>
+	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="BootCore">
 		<package name="grub2-efi-aa64" arch="aarch64"/>
 		<package name="grub2-efi-aa64-modules" arch="aarch64"/>
 		<package name="shim-signed-aa64" arch="aarch64"/>
 		<package name="grub2-efi-aa64" arch="aarch64"/>
 		<package name="uboot-images-armv8" arch="aarch64"/>
-		<package name="grubby"/>
 		<package name="kernel-16k"/>
 		<package name="kernel-16k-modules-extra"/>
 		<package name="systemd-oomd-defaults"/>

From 0521c46afa81aa8235679be52b8ac41a4b2a8a17 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Apr 09 2024 02:53:03 +0000
Subject: [PATCH 3/5] config.sh: Drop unneeded configuration


The various systemd services are enabled through presets already,
so this is redundant.

---

diff --git a/config.sh b/config.sh
index 201f0a1..81bf143 100755
--- a/config.sh
+++ b/config.sh
@@ -54,12 +54,6 @@ passwd -l root
 # Setup default services
 #--------------------------------------
 
-## Enable chrony
-systemctl enable sshd.service
-## Enable NetworkManager
-systemctl enable NetworkManager.service
-## Enable chrony
-systemctl enable chronyd.service
 ## Enable persistent journal
 mkdir -p /var/log/journal
 

From 01b18f3e89d61942df7a27e00942419f0f93cde0 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Apr 09 2024 03:15:57 +0000
Subject: [PATCH 4/5] tmt: Add missing runtime dependency on python3-click


It's needed for builder.py.

---

diff --git a/tmt/tests/build-image.fmf b/tmt/tests/build-image.fmf
index 32e2c28..3b3d883 100644
--- a/tmt/tests/build-image.fmf
+++ b/tmt/tests/build-image.fmf
@@ -7,6 +7,7 @@ require:
   - libselinux-utils
   - p7zip-plugins
   - python3-boto3
+  - python3-click
   - rpmdistro-repoquery
   - zip
   - zstd

From 2820e4b2bbd617f846420e743a48ed0dd78db228 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Apr 11 2024 03:21:54 +0000
Subject: [PATCH 5/5] tmt: Install the kiwi system deps for disk images


This ensures all the tools needed for building disk images are
present.

---

diff --git a/tmt/tests/build-image.fmf b/tmt/tests/build-image.fmf
index 3b3d883..8bdba26 100644
--- a/tmt/tests/build-image.fmf
+++ b/tmt/tests/build-image.fmf
@@ -4,6 +4,7 @@ require:
   - fatcat
   - git-core
   - kiwi
+  - kiwi-systemdeps-disk-images
   - libselinux-utils
   - p7zip-plugins
   - python3-boto3