From a59e0c1efb5e5f0a206d2cc8f9ed193ef6898702 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Dec 14 2024 09:23:55 +0000
Subject: [PATCH 1/2] Merge branch 'rawhide' into f40


---

diff --git a/components/base.xml b/components/base.xml
index 77da92a..958aab9 100644
--- a/components/base.xml
+++ b/components/base.xml
@@ -13,6 +13,16 @@
 		<ignore name="dracut-config-rescue"/>
 		<ignore name="generic-release*"/>
 		<ignore name="generic-logos*"/>
+		<!-- pulled in as Recommends: via toolbox -> podman -> containers-common-extra -->
+		<ignore name="qemu-user-static"/>
+		<!-- ignore *-firmware packages which are unlikely to be used -->
+		<ignore name="amd-gpu-firmware"/>
+		<ignore name="amd-ucode-firmware"/>
+		<ignore name="intel-audio-firmware"/>
+		<ignore name="intel-gpu-firmware"/>
+		<ignore name="iwlwifi-mvm-firmware"/>
+		<ignore name="nvidia-gpu-firmware"/>
+		<ignore name="qcom-firmware"/>
 		<!-- Asahi packages -->
 		<package name="alsa-ucm-asahi"/>
 		<package name="asahi-platform-metapackage"/>
diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml
index 137449c..fa0f272 100644
--- a/components/desktop-environments.xml
+++ b/components/desktop-environments.xml
@@ -24,9 +24,7 @@
 		<package name="plymouth-system-theme"/>
 		<ignore name="@dial-up"/>
 		<ignore name="@guest-desktop-agents"/>
-	</packages>
-	<packages type="uninstall" profiles="DesktopCommon">
-		<package name="xorg-x11-server-Xorg"/>
+		<ignore name="xorg-x11-server-Xorg"/>
 	</packages>
 	<packages type="bootstrap" patternType="plusRecommended" profiles="GNOME-Desktop">
 		<package name="fedora-release-workstation"/>
diff --git a/make-asahi-installer-package.sh b/make-asahi-installer-package.sh
index f7ec675..d376c1f 100755
--- a/make-asahi-installer-package.sh
+++ b/make-asahi-installer-package.sh
@@ -47,7 +47,7 @@ if [ -e "$package" ]; then
   fail "$package already exists, aborting"
 fi
 
-requireCommands 7z awk cat cp dd fdisk file mkdir mv stat wget
+requireCommands 7z awk cat cp dd fdisk file mkdir mv stat curl
 
 workdir="$(mktemp -dp /var/tmp)"
 trap 'rm -rf "$workdir"' EXIT
@@ -79,7 +79,7 @@ root_size="$(stat -c %s "${workdir}/package/root.img")"
 
 # boot picker icon
 if [ ! -f fedora.icns ]; then
-  wget https://pagure.io/fedora-logos/blob/master/f/bootloader/fedora.icns
+  curl -LO https://pagure.io/fedora-logos/blob/master/f/bootloader/fedora.icns
 fi
 cp -p fedora.icns "${workdir}/package"
 
@@ -93,7 +93,7 @@ if [ "$release" != rawhide -a $release -le 39 ]; then
 fi
 openh264_urls=$(rpmdistro-repoquery fedora "$release" ${openh264_rpms} --location)
 
-if [ -e "${openh264_urls}" ]; then
+if [ -z "${openh264_urls}" ]; then
   extras="{}"
 else
   extras="$(printf '%s\n' "${openh264_urls}" | newlineToJson)"

From c5fa2db395e1b4d7b37efe46c40ebae117416357 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Dec 14 2024 10:39:51 +0000
Subject: [PATCH 2/2] Revert "components/desktop-environments: Exclude Xorg instead of uninstalling it"


This reverts commit 48f14ec616c963a198e0351d609943368c78abd2.

---

diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml
index fa0f272..137449c 100644
--- a/components/desktop-environments.xml
+++ b/components/desktop-environments.xml
@@ -24,7 +24,9 @@
 		<package name="plymouth-system-theme"/>
 		<ignore name="@dial-up"/>
 		<ignore name="@guest-desktop-agents"/>
-		<ignore name="xorg-x11-server-Xorg"/>
+	</packages>
+	<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"/>