From 5da74d42ea3244185b7cc5fffa91f6d5fc67e593 Mon Sep 17 00:00:00 2001
From: oxmc7769 <oxmc7769.mail@gmail.com>
Date: Sat, 7 Mar 2026 01:05:29 -0800
Subject: [PATCH] broke arm64 builds somehow?

---
 stage0/00-configure-apt/00-run.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/stage0/00-configure-apt/00-run.sh b/stage0/00-configure-apt/00-run.sh
index d166fd1..4cddab8 100755
--- a/stage0/00-configure-apt/00-run.sh
+++ b/stage0/00-configure-apt/00-run.sh
@@ -8,6 +8,7 @@ if [[ "${ARCH}" == "arm64" || "${ARCH}" == "armhf" ]]; then
 	install -m 644 files/raspi.sources "${ROOTFS_DIR}/etc/apt/sources.list.d/"
 	sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/raspbian.sources"
 	sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/raspi.sources"
+	install -m 644 files/raspberrypi-archive-keyring.pgp "${ROOTFS_DIR}/usr/share/keyrings/"
 elif [[ "${ARCH}" == "amd64" ]]; then
 	install -m 644 files/debian.sources "${ROOTFS_DIR}/etc/apt/sources.list.d/"
 	sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/debian.sources"
@@ -16,6 +17,7 @@ fi
 # Configure oxmc apt sources
 install -m 644 files/oxmc.sources "${ROOTFS_DIR}/etc/apt/sources.list.d/"
 sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/oxmc.sources"
+install -m 644 files/oxmc.pgp "${ROOTFS_DIR}/usr/share/keyrings/"
 
 # Configure apt proxy
 if [ -n "$APT_PROXY" ]; then
@@ -36,14 +38,6 @@ fi
 install -m 644 files/apt-chillcraftos-prefs "${ROOTFS_DIR}/etc/apt/preferences.d/"
 sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/preferences.d/apt-chillcraftos-prefs"
 
-# Add raspberrypi-archive-keyring to apt if armhf or arm64
-if [[ "${ARCH}" == "arm64" || "${ARCH}" == "armhf" ]]; then
-	install -m 644 files/raspberrypi-archive-keyring.pgp "${ROOTFS_DIR}/usr/share/keyrings/"
-fi
-
-# Add oxmc-archive-keyring to apt
-install -m 644 files/oxmc.pgp "${ROOTFS_DIR}/usr/share/keyrings/"
-
 # Add armhf and arm64 architectures, update and upgrade and cache policy
 on_chroot <<- \EOF
 	SYSTEM_ARCH="$(dpkg --print-architecture)"