From 38e1506a0f585fcd1435519b82d49f0d44a76659 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Dec 13 2024 13:58:31 +0000
Subject: [PATCH 1/2] Ignore qemu-user-static (indirect toolbox/podman recommend)


"qemu-user-static" install qemu-user-static sub-packages for all
supported architectures using several hundred megabyte of disk space.
These are not relevant for desktop use and should not end up in the
default image.

---

diff --git a/components/base.xml b/components/base.xml
index 77da92a..786fa9f 100644
--- a/components/base.xml
+++ b/components/base.xml
@@ -13,6 +13,8 @@
 		<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"/>
 		<!-- Asahi packages -->
 		<package name="alsa-ucm-asahi"/>
 		<package name="asahi-platform-metapackage"/>

From c53d0b1e67ac213bc5521dc6025c918478784594 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Dec 13 2024 19:08:52 +0000
Subject: [PATCH 2/2] Use curl to download the fedora partition logo


wget is not available by default in Fedora 41+.

---

diff --git a/make-asahi-installer-package.sh b/make-asahi-installer-package.sh
index 018a14f..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"