From 9325bae780096aa8cc0658fb08d1b1b9a5c82c3c Mon Sep 17 00:00:00 2001
From: Fabian Arrotin <arrfab@centos.org>
Date: Sep 13 2022 07:23:06 +0000
Subject: Merging .xml into config.xml - needed for koji kiwi plugin


Signed-off-by: Fabian Arrotin <arrfab@centos.org>

---

diff --git a/kiwi/complex-build/config.xml b/kiwi/complex-build/config.xml
index 49399bc..8e57c01 100644
--- a/kiwi/complex-build/config.xml
+++ b/kiwi/complex-build/config.xml
@@ -15,12 +15,185 @@
 		<rpm-check-signatures>true</rpm-check-signatures>
 		<release-version>9</release-version>
 	</preferences>
-	<include from="this://./repositories/core.xml"/>
-	<include from="this://./repositories/epel.xml"/>
-	<include from="this://./components/boot.xml"/>
-	<include from="this://./components/users.xml"/>
-	<include from="this://./platforms/cloud.xml"/>
-	<include from="this://./platforms/vagrant.xml"/>
+	   <repository type="rpm-md" alias="extras-common" sourcetype="baseurl">
+        <source path="http://mirror.stream.centos.org/SIGs/9-stream/extras/$basearch/extras-common/">
+            <signing key="file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Extras"/>
+        </source>
+    </repository>
+    <repository type="rpm-md" alias="crb" sourcetype="baseurl">
+        <source path="http://mirror.stream.centos.org/9-stream/CRB/$basearch/os/">
+            <signing key="file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official"/>
+        </source>
+    </repository>
+    <repository type="rpm-md" alias="appstream" sourcetype="baseurl">
+        <source path="http://mirror.stream.centos.org/9-stream/AppStream/$basearch/os/">
+            <signing key="file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official"/>
+        </source>
+    </repository>
+    <repository type="rpm-md" alias="baseos" sourcetype="baseurl">
+        <source path="http://mirror.stream.centos.org/9-stream/BaseOS/$basearch/os/">
+            <signing key="file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official"/>
+        </source>
+    </repository>
+    <repository type="rpm-md" alias="epel-next" sourcetype="baseurl">
+        <source path="https://dl.fedoraproject.org/pub/epel/next/9/Everything/$basearch/">
+            <signing key="file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-9"/>
+        </source>
+    </repository>
+    <repository type="rpm-md" alias="epel" sourcetype="baseurl">
+        <source path="https://dl.fedoraproject.org/pub/epel/9/Everything/$basearch/">
+            <signing key="file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-9"/>
+        </source>
+    </repository>
+	<packages type="image">
+		<package name="epel-release"/>
+		<package name="epel-next-release"/>
+	</packages>
+	<profiles>
+		<profile name="BootCore" description="Boot core packages"/>
+	</profiles>
+	<packages type="image" profiles="BootCore">
+		<package name="grub2-efi-aa64" arch="aarch64"/>
+		<package name="grub2-efi-aa64-modules" arch="aarch64"/>
+		<package name="grub2-efi-x64" arch="x86_64"/>
+		<package name="grub2-efi-x64-modules" arch="x86_64"/>
+		<package name="grub2-pc" arch="x86_64"/>
+		<package name="grub2-pc-modules" arch="x86_64"/>
+		<package name="shim-signed-aa64" arch="aarch64"/>
+		<package name="shim-signed-x64" arch="x86_64"/>
+		<package name="kernel-core"/>
+	</packages>
+	<users profiles="Azure,AWSEC2,OpenStack,LiveInstall">
+		<!-- The password here does not matter, it will be erased in config.sh -->
+		<user name="root" groups="root" password="linux" home="/root" pwdformat="plain" />
+	</users>
+	<profiles>
+		<profile name="CloudCore" description="Cloud spin core packages">
+			<requires profile="BootCore"/>
+		</profile>
+		<profile name="Azure" description="Azure Guest Image">
+			<requires profile="CloudCore"/>
+		</profile>
+		<profile name="AWSEC2" description="AWS EC2 HVM Guest Image">
+			<requires profile="CloudCore"/>
+		</profile>
+		<profile name="GCE" description="GCE Guest Image">
+			<requires profile="CloudCore"/>
+		</profile>
+		<profile name="OpenStack" description="OpenStack Guest Image">
+			<requires profile="CloudCore"/>
+		</profile>
+	</profiles>
+	<preferences profiles="Azure">
+		<type image="oem" filesystem="ext4" kernelcmdline="USE_BY_UUID_DEVICE_NAMES=1 earlyprintk=ttyS0 console=ttyS0 rootdelay=300 net.ifnames=0 dis_ucode_ldr scsi_mod.use_blk_mq=1 multipath=off" devicepersistency="by-uuid" formatoptions="force_size" format="vhd-fixed" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi">
+			<bootloader name="grub2" console="serial" timeout="1" timeout_style="countdown"/>
+			<systemdisk>
+				<volume name="home"/>
+				<volume name="root"/>
+				<volume name="var"/>
+			</systemdisk>
+			<size unit="G">5</size>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<preferences profiles="AWSEC2">
+		<type image="oem" filesystem="ext4" kernelcmdline="console=ttyS0 net.ifnames=0 nvme_core.io_timeout=4294967295 nvme_core.admin_timeout=4294967295 8250.nr_uarts=4 dis_ucode_ldr multipath=off" devicepersistency="by-label" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi">
+			<bootloader name="grub2" timeout="1"/>
+			<size unit="G">5</size>
+			<systemdisk>
+				<volume name="home"/>
+				<volume name="root"/>
+				<volume name="var"/>
+			</systemdisk>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<preferences profiles="GCE">
+		<type image="oem" filesystem="ext4" kernelcmdline="console=ttyS0,38400n8 multipath=off net.ifnames=0 dis_ucode_ldr" devicepersistency="by-label" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" format="gce" firmware="uefi">
+			<bootloader name="grub2" timeout="1"/>
+			<size unit="G">5</size>
+			<systemdisk>
+				<volume name="home"/>
+				<volume name="root"/>
+				<volume name="var"/>
+			</systemdisk>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<preferences profiles="OpenStack">
+		<type image="oem" filesystem="ext4" kernelcmdline="console=ttyS0 net.ifnames=0 dis_ucode_ldr" devicepersistency="by-label" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" format="qcow2">
+			<bootloader name="grub2" console="serial" timeout="1"/>
+			<size unit="G">5</size>
+			<systemdisk>
+				<volume name="home"/>
+				<volume name="root"/>
+				<volume name="var"/>
+			</systemdisk>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<packages type="image" profiles="CloudCore">
+		<ignore name="dracut-config-rescue"/>
+		<ignore name="firewalld"/>
+		<ignore name="kernel"/>
+		<ignore name="*-firmware"/>
+		<ignore name="geolite2-city"/>
+		<ignore name="geolite2-country"/>
+		<package name="cloud-init"/>
+		<package name="cloud-utils-growpart"/>
+		<package name="gdisk"/>
+		<package name="glibc-langpack-en"/>
+	</packages>
+	<packages type="image" profiles="Azure">
+		<package name="WALinuxAgent"/>
+	</packages>
+	<packages type="image" profiles="OpenStack">
+		<package name="qemu-guest-agent"/>
+	</packages>
+	<profiles>
+		<profile name="Vagrant" description="Vagrant packages">
+			<requires profile="BootCore"/>
+		</profile>
+	</profiles>
+	<preferences profiles="Vagrant">
+		<type image="oem" filesystem="ext4" kernelcmdline="console=ttyS0 net.ifnames=0 dis_ucode_ldr" devicepersistency="by-label" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" format="vagrant">
+			<bootloader name="grub2" console="serial" timeout="1"/>
+			<size unit="G">5</size>
+			<systemdisk>
+				<volume name="home"/>
+				<volume name="root"/>
+				<volume name="var"/>
+			</systemdisk>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<users profiles="Vagrant">
+		<!-- Standard password for the vagrant user, used by all images -->
+		<user name="vagrant" groups="vagrant" password="vagrant" home="/home/vagrant" pwdformat="plain" />
+		<user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/>
+	</users>
+	<packages type="image" profiles="Vagrant">
+		<ignore name="dracut-config-rescue"/>
+		<ignore name="firewalld"/>
+		<ignore name="kernel"/>
+		<ignore name="*-firmware"/>
+		<ignore name="geolite2-city"/>
+		<ignore name="geolite2-country"/>
+		<package name="gdisk"/>
+		<package name="glibc-langpack-en"/>
+		<package name="qemu-guest-agent"/>
+	</packages>
+
 	<packages type="image">
 		<ignore name="rhc"/> <!-- work around broken epel comps groups -->
 		<namedCollection name="core"/>