From 926bfdb7ec31e3a2f522620805e2407af47f855f Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Sep 18 2025 17:22:14 +0000
Subject: [PATCH 1/4] Drop mesa repository


With mesa-25.2.2 in rawhide (and hopefully soon in F43) the Fedora built
mesa packages support Apple silicon systems fully. Install the Fedora
packages by omitting the asahi copr mesa repo.

---

diff --git a/repositories/asahi.xml b/repositories/asahi.xml
index 3f59278..c606b49 100644
--- a/repositories/asahi.xml
+++ b/repositories/asahi.xml
@@ -19,11 +19,6 @@
 			<signing key="https://download.copr.fedorainfracloud.org/results/@asahi/kernel/pubkey.gpg"/>
 		</source>
 	</repository>
-	<repository type="rpm-md" alias="copr_copr.fedorainfracloud.org_group_asahi_mesa" sourcetype="baseurl" priority="5">
-		<source path="https://download.copr.fedorainfracloud.org/results/@asahi/mesa/fedora-$releasever-$basearch/">
-			<signing key="https://download.copr.fedorainfracloud.org/results/@asahi/mesa/pubkey.gpg"/>
-		</source>
-	</repository>
 	<repository type="rpm-md" alias="fedora-asahi-remix-hotfixes" priority="1">
 		<source path="https://fedora-asahi-remix.org/repos/hotfixes/$releasever/">
 			<signing key="file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary"/>

From 59250f8bb00522de43bf02629dda3744c29024c7 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Sep 18 2025 17:22:39 +0000
Subject: [PATCH 2/4] Update build instructions to Fedora 42


---

diff --git a/README.md b/README.md
index ce93ae1..427e363 100644
--- a/README.md
+++ b/README.md
@@ -28,16 +28,16 @@ Note that building non-aarch64 is untested and likely to expose bugs.
 
 The instructions below will use the `podman` command. Only Podman is supported for this workflow.
 
-First, pull down the container of the required environment (Fedora Linux 36 or higher works). We'll use Fedora Linux 37.
+First, pull down the container of the required environment (Fedora Linux 36 or higher works). We'll use Fedora Linux 42.
 
 ```bash
-$ sudo podman pull registry.fedoraproject.org/fedora:37-aarch64
+$ sudo podman pull registry.fedoraproject.org/fedora:42-aarch64
 ```
 
 Assuming you're in the root directory of the Git checkout, set up the container:
 
 ```bash
-$ sudo podman run --privileged --rm -it -v $PWD:/code:z -w /code registry.fedoraproject.org/fedora:37-aarch64 /bin/bash
+$ sudo podman run --privileged --rm -it -v $PWD:/code:z -w /code registry.fedoraproject.org/fedora:21-aarch64 /bin/bash
 ```
 
 Once in the container environment, set up your development environment and run the image build (substitute `<image_type>` and `<image_profile>` for the appropriate settings):

From 0115913f96a5661f34e0293b20e23b48fee0fd88 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Sep 18 2025 17:22:39 +0000
Subject: [PATCH 3/4] Add qemu-img as required package for image build


`qemu-img` is not installed on native f42 builds.

---

diff --git a/README.md b/README.md
index 427e363..eaaa781 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,8 @@ $ sudo podman run --privileged --rm -it -v $PWD:/code:z -w /code registry.fedora
 Once in the container environment, set up your development environment and run the image build (substitute `<image_type>` and `<image_profile>` for the appropriate settings):
 
 ```bash
-# Install kiwi
-[]$ dnf --assumeyes install kiwi
+# Install kiwi and qemu-img
+[]$ dnf --assumeyes install kiwi qemu-img
 # Run the image build
 []$ kiwi-ng --type=<image_type> --profile=<image_profile> --color-output system build --description ./ --target-dir ./outdir
 ```

From 8b14a80f3773833de0a8448a64729536e098044c Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Sep 18 2025 17:22:39 +0000
Subject: [PATCH 4/4] Create /boot/efi/m1n1 in post_bootstrap.sh


This is required for update-m1n1's builder mode which bind mounts the
EFI system "partition".

---

diff --git a/config.sh b/config.sh
index 3da2ed8..e2bc6f3 100755
--- a/config.sh
+++ b/config.sh
@@ -108,8 +108,7 @@ rm -f /var/lib/rpm/__db*
 #======================================
 # Generate boot.bin
 #======================================
-mkdir -p /boot/efi/m1n1
 update-m1n1 /boot/efi/m1n1/boot.bin
-rm /boot/.builder
+rm /boot/efi/.builder
 
 exit 0
diff --git a/post_bootstrap.sh b/post_bootstrap.sh
index 91ad0d5..02a442a 100755
--- a/post_bootstrap.sh
+++ b/post_bootstrap.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Flag file to ensure update-m1n1 doesn't try to autodetect the ESP
-touch /boot/.builder
+mkdir -p /boot/efi/m1n1
+touch /boot/efi/.builder
 
 exit 0