From 964c73ab6e57eda862b6f2390942491e35f3696f Mon Sep 17 00:00:00 2001
From: Arjan H <github@hakwerk.com>
Date: Thu, 4 Dec 2025 15:56:27 +0100
Subject: [PATCH] Use deb822 format for APT sources to properly handle ARM64
 cross-compilation

---
 .github/workflows/build-standalone.yml | 26 ++++++++++++++++++++++----
 .github/workflows/release.yml          | 26 ++++++++++++++++++++++----
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-standalone.yml b/.github/workflows/build-standalone.yml
index 70c4b0f..53060a1 100644
--- a/.github/workflows/build-standalone.yml
+++ b/.github/workflows/build-standalone.yml
@@ -39,15 +39,33 @@ jobs:
 
       - name: APT Install
         run: |
-          sudo bash -c 'cat > /etc/apt/sources.list.d/arm64.sources <<EOF
+          sudo dpkg --add-architecture arm64
+
+          sudo rm -f /etc/apt/sources.list.d/ubuntu.sources
+
+          # Create proper deb822 format sources for both amd64 and arm64
+          cat <<EOF | sudo tee /etc/apt/sources.list.d/amd64.sources
+          Types: deb
+          URIs: http://azure.archive.ubuntu.com/ubuntu/
+          Suites: noble noble-updates noble-backports
+          Components: main restricted universe multiverse
+          Architectures: amd64
+
+          Types: deb
+          URIs: http://security.ubuntu.com/ubuntu/
+          Suites: noble-security
+          Components: main restricted universe multiverse
+          Architectures: amd64
+          EOF
+
+          cat <<EOF | sudo tee /etc/apt/sources.list.d/arm64.sources
           Types: deb
           URIs: http://ports.ubuntu.com/ubuntu-ports/
           Suites: noble noble-updates noble-backports noble-security
           Components: main restricted universe multiverse
           Architectures: arm64
-          Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
-          EOF'
-          sudo dpkg --add-architecture arm64
+          EOF
+
           sudo apt-get update
           sudo apt-get -y install build-essential debhelper fakeroot crossbuild-essential-arm64
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b6d4b9f..c5cf5db 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,15 +30,33 @@ jobs:
       - name: APT Install
         id: aptInstall
         run: |
-          sudo bash -c 'cat > /etc/apt/sources.list.d/arm64.sources <<EOF
+          sudo dpkg --add-architecture arm64
+
+          sudo rm -f /etc/apt/sources.list.d/ubuntu.sources
+
+          # Create proper deb822 format sources for both amd64 and arm64
+          cat <<EOF | sudo tee /etc/apt/sources.list.d/amd64.sources
+          Types: deb
+          URIs: http://azure.archive.ubuntu.com/ubuntu/
+          Suites: noble noble-updates noble-backports
+          Components: main restricted universe multiverse
+          Architectures: amd64
+
+          Types: deb
+          URIs: http://security.ubuntu.com/ubuntu/
+          Suites: noble-security
+          Components: main restricted universe multiverse
+          Architectures: amd64
+          EOF
+
+          cat <<EOF | sudo tee /etc/apt/sources.list.d/arm64.sources
           Types: deb
           URIs: http://ports.ubuntu.com/ubuntu-ports/
           Suites: noble noble-updates noble-backports noble-security
           Components: main restricted universe multiverse
           Architectures: arm64
-          Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
-          EOF'
-          sudo dpkg --add-architecture arm64
+          EOF
+
           sudo apt-get update
           sudo apt-get -y install build-essential debhelper fakeroot crossbuild-essential-arm64