Remove change and use core.xmk symlink

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
Initial draft for riscv64 (F41)
2024-11-28 16:34:12 +02:00 · 2024-11-28 16:31:59 +02:00 · 2024-11-23 18:04:20 -05:00 · 2024-11-23 17:08:11 -05:00 · 2024-11-23 17:08:11 -05:00 · 2024-11-23 16:45:11 -05:00
26 changed files with 305 additions and 19 deletions
--- a/Fedora.kiwi
+++ b/Fedora.kiwi
@ -47,6 +47,7 @@
 	<include from="this://./teams/sway.xml"/>
 	<include from="this://./teams/budgie.xml"/>
 	<include from="this://./teams/miraclewm.xml"/>
+	<include from="this://./teams/riscv.xml"/>
 	<packages type="bootstrap">
 		<package name="basesystem"/>
 		<package name="filesystem"/>
--- a/components/boot.xml
+++ b/components/boot.xml
@ -6,7 +6,7 @@
 			<requires profile="BootCore"/>
 		</profile>
 	</profiles>
-	<preferences profiles="BootDiskCore" arch="x86_64,aarch64">
+	<preferences profiles="BootDiskCore" arch="x86_64,aarch64,riscv64">
 		<type image="oem"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="x-systemd.growfs,compress=zstd:1"
 		      kernelcmdline="rhgb quiet" devicepersistency="by-uuid"
@ -67,6 +67,8 @@
 	<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"/>
+		<package name="grub2-efi-riscv64-modules" arch="riscv64"/>
 		<package name="grub2-efi-x64" arch="x86_64"/>
 		<package name="grub2-efi-x64-modules" arch="x86_64"/>
 		<package name="grub2-pc" arch="x86_64"/>
@ -75,6 +77,7 @@
 		<package name="s390utils-base" arch="s390x"/>
 		<package name="shim-signed-aa64" arch="aarch64"/>
 		<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"/>
@ -82,6 +85,7 @@
 	<packages type="image" patternType="plusRecommended" profiles="BootCoreUKI">
 		<package name="shim-signed-aa64" arch="aarch64"/>
 		<package name="shim-signed-x64" arch="x86_64"/>
+		<package name="shim-unsigned-riscv64" arch="riscv64"/>
 		<package name="systemd-oomd-defaults"/>
 		<package name="systemd-resolved"/>
 		<package name="kernel-uki-virt"/>
@ -91,6 +95,7 @@
 	<packages type="iso" patternType="plusRecommended" profiles="BootCore">
 		<package name="grub2-efi-aa64-cdboot" arch="aarch64"/>
 		<package name="grub2-efi-x64-cdboot" arch="x86_64"/>
+		<package name="grub2-efi-riscv64-cdboot" arch="riscv64"/>
 	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="BootDiskCore">
 		<package name="arm-image-installer" arch="aarch64"/>
@ -102,5 +107,6 @@
 		<package name="btrfs-progs"/>
 		<package name="udisks2-btrfs"/>
 		<package name="uboot-images-armv8" arch="aarch64"/>
+		<package name="uboot-images-riscv64" arch="riscv64"/>
 	</packages>
 </image>
--- a/components/desktops/common.xml
+++ b/components/desktops/common.xml
@ -10,6 +10,7 @@
 		<namedCollection name="printing"/>
 		<namedCollection name="guest-desktop-agents"/>
 		<namedCollection name="standard"/>
+		<package name="mediawriter"/>
 		<ignore name="gfs2-utils"/>
 		<ignore name="reiserfs-utils"/>
 	</packages>
--- a/components/liveinstall.xml
+++ b/components/liveinstall.xml
@ -7,7 +7,7 @@
 	<preferences profiles="LiveInstall" arch="x86_64">
 		<type image="iso"
 			publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
-			primary="true" flags="dmsquash" mediacheck="true"
+			primary="true" flags="dmsquash" filesystem="squashfs" squashfscompression="xz" mediacheck="true"
 			firmware="uefi" efifatimagesize="30" kernelcmdline="quiet rhgb"
 			>
 			<bootloader name="grub2" grub_template="grub-x86.cfg.iso-template" console="console" timeout="10"/>
@ -16,16 +16,26 @@
 	<preferences profiles="LiveInstall" arch="aarch64">
 		<type image="iso"
 			publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
-			primary="true" flags="dmsquash" mediacheck="true"
+			primary="true" flags="dmsquash" filesystem="squashfs" squashfscompression="xz" mediacheck="true"
 			firmware="uefi" efifatimagesize="30" kernelcmdline="quiet rhgb"
 			>
 			<bootloader name="grub2" grub_template="grub-arm.cfg.iso-template" console="console" timeout="10"/>
 		</type>
 	</preferences>
+	<preferences profiles="LiveInstall" arch="riscv64">
+		<type image="iso"
+			publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
+			primary="true" flags="dmsquash" filesystem="squashfs" squashfscompression="xz" mediacheck="true"
+			firmware="uefi" efifatimagesize="30" kernelcmdline="quiet rhgb"
+			>
+			<bootloader name="grub2" grub_template="grub-riscv64.cfg.iso-template" console="console" timeout="10"/>
+		</type>
+	</preferences>
+
 	<preferences profiles="LiveInstall" arch="ppc64le">
 		<type image="iso"
 			publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
-			primary="true" flags="dmsquash" mediacheck="true"
+			primary="true" flags="dmsquash" filesystem="squashfs" squashfscompression="xz" mediacheck="true"
 			firmware="ofw" kernelcmdline="quiet rhgb"
 			>
 			<bootloader name="grub2" grub_template="grub-ppc.cfg.iso-template" console="console" timeout="10"/>
--- a/components/users.xml
+++ b/components/users.xml
@ -3,4 +3,10 @@
 		<!-- 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>
+	<users profiles="RISCVServer">
+		<!-- The password here does not matter, it will be erased in config.sh -->
+		<user name="root" groups="root" password="linux" home="/root" pwdformat="plain" />
+		<user name="riscv" groups="wheel,mock" password="fedora_rocks!" home="/home/riscv" pwdformat="plain" />
+	</users>
+
 </image>
--- a/config.sh
+++ b/config.sh
@ -302,4 +302,94 @@ EOF
 /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 fi

+# Find the architecture we are on
+installarch=$(uname -m)
+
+# Do custom Fedora/RISCV changes
+if [[ $installarch == "riscv64" ]]; then
+	# Disable default branched fedora repos
+	# We only want to have Fedora/RISCV Koji repos
+	sed -i 's/enabled=1/enabled=0/g' /etc/yum.repos.d/{fedora.repo,fedora-updates.repo,fedora-updates-testing.repo,fedora-cisco-openh264.repo}
+
+	# Create Fedora/RISCV repos
+	cat << EOF > /etc/yum.repos.d/fedora-riscv.repo
+[fedora-riscv]
+name=Fedora RISC-V
+baseurl=http://fedora.riscv.rocks/repos-dist/f41-staging/latest/riscv64/
+enabled=1
+gpgcheck=0
+
+[fedora-riscv-debuginfo]
+name=Fedora RISC-V - Debug
+baseurl=http://fedora.riscv.rocks/repos-dist/f41-staging/latest/riscv64/debug/
+enabled=0
+gpgcheck=0
+
+[fedora-riscv-source]
+name=Fedora RISC-V - Source
+baseurl=http://fedora.riscv.rocks/repos-dist/f41-staging/latest/src/
+enabled=0
+gpgcheck=0
+EOF
+
+	# Create Fedora/RISC-V Koji repo (pulling directly from Koji)
+	cat << EOF > /etc/yum.repos.d/fedora-riscv-koji.repo
+[fedora-riscv-koji]
+name=Fedora RISC-V Koji
+baseurl=http://fedora.riscv.rocks/repos/f41-staging/latest/riscv64/
+enabled=0
+gpgcheck=0
+EOF
+
+	# Disable tmpfs for /tmp
+	# Most boards don't have a lot of RAM.
+	systemctl mask tmp.mount
+
+	# We most likely don't have HW random number generator
+	systemctl enable haveged.service
+
+	# Update login message
+	cat << EOF | tee /etc/issue /etc/issue.net
+Welcome to the Fedora/RISC-V disk image
+https://fedoraproject.org/wiki/Architectures/RISC-V
+
+Build date: $(date --utc)
+
+\S
+Kernel \r on an \m (\l)
+
+User 'root' with password is 'linux'.
+User 'riscv' with password 'fedora_rocks!' in 'wheel'
+and 'mock' groups.
+
+For updates and latest information read:
+https://fedoraproject.org/wiki/Architectures/RISC-V
+
+Fedora/RISC-V
+-------------
+Koji:               http://fedora.riscv.rocks/koji/
+SCM:                http://fedora.riscv.rocks:3000/
+Distribution rep.:  http://fedora.riscv.rocks/repos-dist/
+Koji internal rep.: http://fedora.riscv.rocks/repos/
+
+EOF
+
+	# Setup toolbox container to use
+	cat << EOF | tee -a /etc/containers/toolbox.conf
+image = "fedora.riscv.rocks:3000/davidlt/fedora-toolbox:41"
+EOF
+
+	# Add insecure (HTTP) Fedora/RISCV registry (Gitea)
+	cat << EOF | tee -a /etc/containers/registries.conf
+[[registry]]
+location="fedora.riscv.rocks:3000"
+insecure=true
+EOF
+
+	# Add Fedora/RISCV registry for search
+	sed -i -r 's/(unqualified-search-registries = \[")/\1fedora.riscv.rocks:3000", "/' /etc/containers/registries.conf
+
+
+fi
+
 exit 0
--- a/grub-riscv64.cfg.iso-template
+++ b/grub-riscv64.cfg.iso-template
@ -0,0 +1,41 @@
+# Inspired by the config used for lorax-built live media
+
+set default="1"
+
+function load_video {
+	insmod efi_gop
+	insmod efi_uga
+	insmod video_bochs
+	insmod video_cirrus
+	insmod all_video
+}
+set basicgfx="nomodeset"
+
+load_video
+set gfxpayload=keep
+insmod gzio
+insmod part_gpt
+insmod ext2
+
+terminal_input console
+terminal_output ${terminal_output}
+
+set timeout=${boot_timeout}
+set timeout_style=${boot_timeout_style}
+
+search ${search_params}
+
+menuentry "Start ${title}" --class fedora --class gnu-linux --class gnu --class os {
+	linux ($$root)${bootpath}/${kernel_file} ${boot_options}
+	initrd ($$root)${bootpath}/${initrd_file}
+}
+menuentry "Test this media & start ${title}" --class fedora --class gnu-linux --class gnu --class os {
+	linux ($$root)${bootpath}/${kernel_file} ${boot_options} rd.live.check
+	initrd ($$root)${bootpath}/${initrd_file}
+}
+submenu "Troubleshooting -->" {
+	menuentry "Start ${title} in basic graphics mode" --class fedora --class gnu-linux --class gnu --class os {
+		linux ($$root)${bootpath}/${kernel_file} ${boot_options} $${basicgfx}
+		initrd ($$root)${bootpath}/${initrd_file}
+	}
+}
--- a/repositories/core-riscv64.xml
+++ b/repositories/core-riscv64.xml
@ -0,0 +1,11 @@
+<image>
+	<repository type="rpm-md" alias="fedora" sourcetype="baseurl">
+		<source path="http://fedora.riscv.rocks/repos-dist/$releasever-staging/latest/$basearch" />
+	</repository>
+	<!-- For folks to enable for building images with content in Koji working repos -->
+	<!--
+	<repository type="rpm-md" alias="fedora-koji" sourcetype="baseurl">
+		<source path="http://fedora.riscv.rocks/repos/$releasever/latest/$basearch"/>
+	</repository>
+	-->
+</image>
--- a/repositories/core.xml
+++ b/repositories/core.xml
@ -1 +1 @@
-core-nonrawhide.xml
+core-riscv64.xml
--- a/scripts/fedora-live-iso-label-generator
+++ b/scripts/fedora-live-iso-label-generator
@ -51,6 +51,7 @@ volume_id_substitutions = {
             "Security": "Sec",
              "Sericea": "Src",
               "Server": "S",
+          "Workstation": "WS",
        "-Workstation-": "-WS-",
 }

@ -89,8 +90,13 @@ image_profile_variant_appid_prefix = image_profile_baseprefix

 if image_profile_baseprefix in profile_to_application_id.keys():
 	image_profile_variant_appid_prefix = profile_to_application_id[image_profile_baseprefix]
+else:
+	image_profile_variant_appid_prefix = image_profile_baseprefix

-image_profile_variant_volid_prefix = volume_id_substitutions[image_profile_variant_appid_prefix]
+if image_profile_variant_appid_prefix in volume_id_substitutions.keys():
+	image_profile_variant_volid_prefix = volume_id_substitutions[image_profile_variant_appid_prefix]
+else:
+	image_profile_variant_volid_prefix = image_profile_variant_appid_prefix

 image_appid = f"{image_basename}-{image_profile_variant_appid_prefix}-Live-{image_version}"
 image_volid = f"{image_basename}-{image_profile_variant_volid_prefix}-Live-{image_volid_version}"
--- a/teams/budgie.xml
+++ b/teams/budgie.xml
@ -4,8 +4,12 @@
 			<requires profile="Budgie-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="Budgie-Disk" description="Budgie Spin Install Disk">
+			<requires profile="Budgie-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="Budgie-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Budgie-Live,Budgie-Disk">
 		<package name="fedora-release-budgie"/>
 	</packages>
 </image>
--- a/teams/cinnamon.xml
+++ b/teams/cinnamon.xml
@ -4,8 +4,12 @@
 			<requires profile="Cinnamon-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="Cinnamon-Disk" description="Cinnamon Spin Install Disk">
+			<requires profile="Cinnamon-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="Cinnamon-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Cinnamon-Live,Cinnamon-Disk">
 		<package name="fedora-release-cinnamon"/>
 	</packages>
 </image>
--- a/teams/cloud/cloud.xml
+++ b/teams/cloud/cloud.xml
@ -89,7 +89,7 @@
 			</oemconfig>
 		</type>
 	</preferences>
-	<preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64">
+	<preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64,riscv64">
 		<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 console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
@ -149,7 +149,7 @@
 			</oemconfig>
 		</type>
 	</preferences>
-	<preferences profiles="Cloud-Base-UEFI-UKI" arch="x86_64,aarch64">
+	<preferences profiles="Cloud-Base-UEFI-UKI" arch="x86_64,aarch64,riscv64">
 		<type image="oem" format="qcow2"
 		      firmware="uefi" efipartsize="1000"
 		      bootpartition="false"
--- a/teams/cloud/container.xml
+++ b/teams/cloud/container.xml
@ -242,7 +242,7 @@
 		<package name="man-db"/>
 		<package name="man-pages"/>
 		<package name="mesa-dri-drivers"/>
-		<package name="mesa-va-drivers" arch="aarch64,ppc64le,x86_64"/> <!-- doesn't exist in s390x -->
+		<package name="mesa-va-drivers" arch="aarch64,ppc64le,x86_64,riscv64"/> <!-- doesn't exist in s390x -->
 		<package name="mesa-vulkan-drivers"/>
 		<package name="mtr"/>
 		<package name="nss-mdns"/>
--- a/teams/i3.xml
+++ b/teams/i3.xml
@ -4,8 +4,12 @@
 			<requires profile="i3-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="i3-Disk" description="i3 Spin Install Disk">
+			<requires profile="i3-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="i3-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="i3-Live,i3-Disk">
 		<package name="fedora-release-i3"/>
 	</packages>
 </image>
--- a/teams/lxde.xml
+++ b/teams/lxde.xml
@ -4,8 +4,12 @@
 			<requires profile="LXDE-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="LXDE-Disk" description="LXDE Spin Install Disk">
+			<requires profile="LXDE-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="LXDE-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="LXDE-Live,LXDE-Disk">
 		<package name="fedora-release-lxde"/>
 	</packages>
 </image>
--- a/teams/lxqt.xml
+++ b/teams/lxqt.xml
@ -4,8 +4,12 @@
 			<requires profile="LXQt-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="LXQt-Disk" description="LXQt Spin Install Disk">
+			<requires profile="LXQt-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="LXQt-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="LXQt-Live,LXQt-Disk">
 		<package name="fedora-release-lxqt"/>
 	</packages>
 </image>
--- a/teams/mate.xml
+++ b/teams/mate.xml
@ -4,8 +4,12 @@
 			<requires profile="MATE-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="MATE_Compiz-Disk" description="MATE-Compiz Spin Install Disk">
+			<requires profile="MATE-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="MATE_Compiz-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="MATE_Compiz-Live,MATE_Compiz-Disk">
 		<package name="fedora-release-matecompiz"/>
 	</packages>
 </image>
--- a/teams/riscv.xml
+++ b/teams/riscv.xml
@ -0,0 +1,62 @@
+<image>
+	<profiles>
+		<profile name="RISCVServer" description="RISC-V Server Disk Image">
+			<requires profile="BootCore"/>
+		</profile>
+	</profiles>
+	<preferences profiles="RISCVServer">
+		<type image="oem"
+			filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="x-systemd.growfs,compress=zstd:1"
+			kernelcmdline="earlycon"
+			devicepersistency="by-uuid"
+			bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
+			rootfs_label="fedora"
+			>
+			<bootloader name="grub2" console="serial" timeout="5" timeout_style="menu"/>
+			<size unit="G">5</size>
+			<systemdisk name="fedora">
+				<volume name="@root=root"/>
+				<volume name="home" parent="/"/>
+				<volume name="var" parent="/"/>
+			</systemdisk>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="RISCVServer">
+		<package name="fedora-release-server"/>
+	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="RISCVServer">
+		<namedCollection name="container-management"/>
+		<namedCollection name="server-product-environment"/>
+		<namedCollection name="core"/>
+		<namedCollection name="standard"/>
+		<namedCollection name="hardware-support"/>
+		<namedCollection name="networkmanager-submodules"/>
+		<package name="chrony"/>
+		<package name="lm_sensors"/>
+		<package name="mtd-utils"/>
+		<package name="bdsync"/>
+		<package name="htop"/>
+		<package name="mock"/>
+		<package name="toolbox"/>
+		<package name="cloud-utils-growpart"/>
+		<package name="zstd"/>
+		<package name="haveged"/>
+		<package name="pciutils"/>
+		<package name="nvme-cli"/>
+		<package name="efibootmgr"/>
+		<package name="kernel"/>
+		<package name="kernel-core"/>
+		<package name="kernel-modules"/>
+		<package name="kernel-modules-core"/>
+		<package name="kernel-modules-extra"/>
+		<package name="kernel-tools"/>
+		<package name="opensbi-unstable" arch="riscv64"/>
+		<package name="glibc-langpack-en"/>
+		<ignore name="dracut-config-rescue"/>
+		<package name="uboot-images-riscv64" arch="riscv64"/>
+		<package name="uboot-tools"/>
+	</packages>
+</image>
--- a/teams/soas.xml
+++ b/teams/soas.xml
@ -4,8 +4,12 @@
 			<requires profile="SoaS-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="SoaS-Disk" description="Sugar on a Stick Install Disk">
+			<requires profile="SoaS-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="SoaS-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="SoaS-Live,SoaS-Disk">
 		<package name="fedora-release-soas"/>
 	</packages>
 </image>
--- a/teams/sway.xml
+++ b/teams/sway.xml
@ -4,8 +4,12 @@
 			<requires profile="Sway-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="Sway-Disk" description="Sway Spin Install Disk">
+			<requires profile="Sway-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="Sway-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Sway-Live,Sway-Disk">
 		<package name="fedora-release-sway"/>
 	</packages>
 </image>
--- a/teams/workstation.xml
+++ b/teams/workstation.xml
@ -4,8 +4,12 @@
 			<requires profile="GNOME-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="Workstation-Disk" description="Workstation Edition Install Disk">
+			<requires profile="GNOME-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="Workstation-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Workstation-Live,Workstation-Disk">
 		<package name="fedora-release-workstation"/>
 	</packages>
 </image>
--- a/teams/xfce.xml
+++ b/teams/xfce.xml
@ -4,8 +4,12 @@
 			<requires profile="Xfce-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="Xfce-Disk" description="Xfce Spin Install Disk">
+			<requires profile="Xfce-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="Xfce-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Xfce-Live,Xfce-Disk">
 		<package name="fedora-release-xfce"/>
 	</packages>
 </image>
--- a/tmt/plans/desktop/kde/build-desktop-live.fmf
+++ b/tmt/plans/desktop/kde/build-desktop-live.fmf
@ -7,3 +7,12 @@ environment:
    kiwi_file: Fedora.kiwi
 execute:
    how: tmt
+provision:
+    how: artemis
+    hardware:
+        cpu:
+            # Add more CPUs to make mksquashfs faster
+            processors: ">= 8"
+        disk:
+            # Increase disk size for better IO performance
+            - size: '>=500 GiB'
--- a/tmt/tests/build-image.fmf
+++ b/tmt/tests/build-image.fmf
@ -10,4 +10,6 @@ framework: shell
 path: /
 test: |
  ./kiwi-build --debug --image-type="$image_type" --image-profile="$image_profile" --kiwi-description-dir="${TMT_TREE}" --kiwi-file="$kiwi_file" --output-dir="${TMT_TEST_DATA}" --image-release="$(date --utc +'%Y%m%d.%H%M')"
+  mv ${TMT_TEST_DATA}-build/build/image-root.log ${TMT_TEST_DATA}
+  rm -rf "${TMT_TEST_DATA}-build"
 duration: 60m
--- a/uki-editbootconfig.sh
+++ b/uki-editbootconfig.sh
@ -5,6 +5,7 @@ echo "###" "$0" "$@"
 case "$(uname -m)" in
    aarch64) arch="aa64"; ARCH="AA64";;
    x86_64)  arch="x64";  ARCH="X64";;
+    riscv64)  arch="riscv64";  ARCH="RISCV64";;
 esac

 # figure where shim.efi and BOOT.CSV are located
Author	SHA1	Message	Date
David Abdurachmanov	886e78943e	Remove change and use core.xmk symlink Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2024-11-28 16:34:12 +02:00
David Abdurachmanov	de1a80f184	Initial draft for riscv64 (F41) Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2024-11-28 16:31:59 +02:00
Adam Williamson	d01a6e9612	Fix a line ordering error in lxde.xml Signed-off-by: Adam Williamson <awilliam@redhat.com> (cherry picked from commit 4943dc58a8c6d42a7219731b7c75963183753e22)	2024-11-23 18:04:20 -05:00
Neal Gompa	ed3032e4e6	scripts/fedora-live-iso-label-generator: Add Workstation->WS mapping This ensures that live media produced for Workstation Edition has a valid volume ID. (cherry picked from commit 21a2d09ca27e67dde8a546879e603153ec2c92a8)	2024-11-23 17:08:11 -05:00
Neal Gompa	b63dcbd806	scripts/fedora-live-iso-label-generator: Account for unknown profiles This way it does not fail and produces something that makes sense. (cherry picked from commit b1359b9f68513a1aada447c3f419d056fc206555)	2024-11-23 17:08:11 -05:00
Neal Gompa	18ae9533f6	teams: Add install disk profiles for all desktop teams KDE and MiracleWM teams already have it, so this just fills it in for the rest of them. (cherry picked from commit 6816c7d501b80cf886560e716a2435399ba04150)	2024-11-23 16:45:11 -05:00
Neal Gompa	b25a6440f9	tmt: Purge work area contents to free up space on archiving We only need to preserve the log file anyway. (cherry picked from commit c5971107d5ac03129a6e7480aef79bfa8d57c2f3)	2024-11-23 15:44:35 -05:00
Miroslav Vadkerti	87740c8234	Improve test time for kde/build-desktop-live Larger disk means more IO performance. Require more CPUs to aid mksquashfs performance. Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com> (cherry picked from commit 067338f7db3ca39a7ba5677c4d8fea33f827e758)	2024-11-23 15:22:43 -05:00
Neal Gompa	35ef7342b1	components/liveinstall: Use plain squashfs instead of ext4-in-squashfs It results in higher compression ratios. (cherry picked from commit 5486849837974ffc941b226269ae4025bb2b5ff3)	2024-11-23 15:07:38 -05:00
Neal Gompa	8e214f7b8b	components/desktops/common: Ensure Fedora Media Writer is installed We want this on all deliverables. (cherry picked from commit 58210badb5a83d11f9fe088f20c913981d3013f9)	2024-11-23 12:58:29 -05:00