From 12cb853ad9fdc5501bac6c6d65c1d8798d6ae55c Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Sun, 10 Mar 2024 11:00:17 -0400
Subject: [PATCH] Add s390x variant for Cloud-Base-Generic

This allows building cloud images for Z systems.
---
 components/boot.xml   |  1 +
 teams/cloud/cloud.xml | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/components/boot.xml b/components/boot.xml
index a42d469..a57398f 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -14,6 +14,7 @@
 		<package name="grub2-pc" arch="x86_64"/>
 		<package name="grub2-pc-modules" arch="x86_64"/>
 		<package name="grub2-ppc64le" arch="ppc64le"/>
+		<package name="s390utils-base" arch="s390x"/>
 		<package name="shim-signed-aa64" arch="aarch64"/>
 		<package name="shim-signed-x64" arch="x86_64"/>
 		<package name="kernel-core"/>
diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml
index 03466b4..c3d84bc 100644
--- a/teams/cloud/cloud.xml
+++ b/teams/cloud/cloud.xml
@@ -129,6 +129,26 @@
 			</oemconfig>
 		</type>
 	</preferences>
+	<preferences profiles="Cloud-Base-Generic" arch="s390x">
+		<type image="oem" format="qcow2"
+		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
+		      kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8 dasd_mod.dasd=ipldev"
+		      devicepersistency="by-uuid" target_blocksize="4096"
+		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4"
+		      rootfs_label="fedora"
+		      >
+			<bootloader name="zipl" targettype="CDL" timeout="1"/>
+			<size unit="G">5</size>
+			<systemdisk>
+				<volume name="@root=root"/>
+				<volume name="home" parent="/"/>
+				<volume name="var" parent="/"/>
+			</systemdisk>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
 	<preferences profiles="Cloud-Base-UEFI-UKI" arch="x86_64,aarch64">
 		<type image="oem" format="qcow2"
 		      firmware="uefi" efipartsize="1000"