feat/ci: native arm64 build

.github/workflows/orchid.yml

@@ -5,7 +5,15 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runner: ubuntu-latest
+            arch: AMD64
+          - runner: ubuntu-24.04-arm
+            arch: ARM64
+    runs-on: ${{ matrix.runner }}
     container:
       image: ghcr.io/vanilla-os/pico:main
       volumes:
@@ -27,5 +35,5 @@ jobs:
 
     - uses: actions/upload-artifact@v4
       with:
-        name: VanillaOS 2 Orchid ${{ env.CURRENT_DATE }}
+        name: VanillaOS 2 Orchid ${{ matrix.arch }} ${{ env.CURRENT_DATE }}
         path: builds/

build.sh

@@ -73,8 +73,8 @@ build () {
   YYYYMMDD="$(date +%Y%m%d)"
   OUTPUT_DIR="$BASE_DIR/builds/$BUILD_ARCH"
   mkdir -p "$OUTPUT_DIR"
-  FNAME="VanillaOS-$VERSION-$CHANNEL.$YYYYMMDD$OUTPUT_SUFFIX"
-  mv $BASE_DIR/tmp/amd64/live-image-amd64.hybrid.iso "$OUTPUT_DIR/${FNAME}.iso"
+  FNAME="VanillaOS-$VERSION-$CHANNEL-$BUILD_ARCH.$YYYYMMDD$OUTPUT_SUFFIX"
+  mv $BASE_DIR/tmp/$BUILD_ARCH/live-image-$BUILD_ARCH.hybrid.iso "$OUTPUT_DIR/${FNAME}.iso"
 
   # cd into output to so {FNAME}.sha256.txt only
   # includes the filename and not the path to
@@ -85,8 +85,8 @@ build () {
   cd $BASE_DIR
 }
 
-if [[ "$ARCH" == "all" ]]; then
-    build amd64
+if [[ -z "$ARCH" ]]; then
+    build "$(dpkg --print-architecture)"
 else
     build "$ARCH"
 fi

etc/auto/config

@@ -4,32 +4,25 @@ set -e
 
 . ./terraform.conf
 
-if [ "$HWE_KERNEL" = "yes" ]; then
-    KERNEL_FLAVORS="amd64-hwe-${BASEVERSION}"
-else
-    KERNEL_FLAVORS="amd64"
-fi
-
 lb config noauto \
     --architectures "$ARCH" \
     --mode debian \
     --distribution "$BASECODENAME" \
     --parent-distribution "$BASECODENAME" \
     --linux-packages "linux-image linux-headers" \
-    --linux-flavours "$KERNEL_FLAVORS" \
     --bootappend-live "boot=live config username=vanilla user-fullname=Vanilla quiet splash bgrt_disable" \
     \
     --parent-archive-areas "main contrib non-free non-free-firmware" \
     --parent-mirror-bootstrap "$MIRROR_URL" \
     --parent-mirror-chroot-security "http://deb.debian.org/debian-security" \
     --parent-mirror-binary-security "http://deb.debian.org/debian-security" \
-    --parent-mirror-binary "https://repo2.vanillaos.org" \
+    --parent-mirror-binary "$MIRROR_URL" \
     \
     --archive-areas "main contrib non-free non-free-firmware" \
     --mirror-bootstrap "$MIRROR_URL" \
     --mirror-chroot-security "http://deb.debian.org/debian-security" \
     --mirror-binary-security "http://deb.debian.org/debian-security" \
-    --mirror-binary "https://repo2.vanillaos.org" \
+    --mirror-binary "$MIRROR_URL" \
     \
     --keyring-packages debian-keyring \
     --apt-options "--yes --option Acquire::Retries=5 --option Acquire::http::Timeout=100" \

etc/config/hooks/live/001-install-vanilla-installer.chroot

@@ -1,9 +1,9 @@
 #!/bin/sh
 # Description: Install vanilla-installer from source
 
-wget https://github.com/Vanilla-OS/Albius/releases/download/continuous/albius.deb
-apt-get install -y ./albius.deb
-rm albius.deb
+wget https://github.com/Vanilla-OS/Albius/releases/download/continuous/albius-$(dpkg --print-architecture).deb
+apt-get install -y ./albius*.deb
+rm albius*.deb
 
 wget https://github.com/Vanilla-OS/vanilla-installer/releases/download/continuous/vanilla-installer.deb
 apt-get install -y ./vanilla-installer.deb

etc/config/package-lists.vanilla-installer/desktop.list.chroot_live

@@ -8,7 +8,6 @@ squashfs-tools
 cryptsetup
 
 shim-signed
-shim-helpers-amd64-signed
 
 firmware-linux
 firmware-linux-nonfree
@@ -19,11 +18,20 @@ firmware-atheros
 firmware-b43-installer
 firmware-brcm80211
 firmware-sof-signed
-intel-microcode
-amd64-microcode
 b43-fwcutter
 spice-webdavd
 
+#if ARCHITECTURES amd64
+shim-helpers-amd64-signed
+
+intel-microcode
+amd64-microcode
+#endif
+
+#if ARCHITECTURES arm64
+shim-helpers-arm64-signed
+#endif
+
 ca-certificates
 btrfs-progs
 expect
@@ -95,5 +103,8 @@ plymouth-themes
 open-vm-tools
 open-vm-tools-desktop
 qemu-guest-agent
+
+#if ARCHITECTURES amd64
 virtualbox-guest-utils
 virtualbox-guest-x11
+#endif

etc/config/package-lists.vanilla-installer/pool.list.binary

@@ -2,14 +2,25 @@ b43-fwcutter
 firmware-b43-installer
 firmware-brcm80211
 dkms
-intel-microcode
-iucode-tool
 setserial
 user-setup
 
 efibootmgr
+shim-signed
+
+#if ARCHITECTURES amd64
+intel-microcode
+iucode-tool
+
 grub-efi-amd64
 grub-efi-amd64-bin
 grub-efi-amd64-signed
-shim-signed
 shim-helpers-amd64-signed
+#endif
+
+#if ARCHITECTURES arm64
+grub-efi-arm64
+grub-efi-arm64-bin
+grub-efi-arm64-signed
+shim-helpers-arm64-signed
+#endif

etc/terraform.conf

@@ -1,5 +1,5 @@
-# target architecture - i386, arm64 or all
-ARCH="amd64"
+# target architecture - i386, amd64, arm64, or leave empty to use host architecture
+ARCH=""
 
 # base codename
 BASECODENAME="sid"
@@ -22,9 +22,6 @@ NAME="Vanilla OS"
 # mirror to fetch packages from
 MIRROR_URL="https://repo2.vanillaos.org"
 
-# use HWE kernel and packages?
-HWE="yes"
-
 # suffix for generated .iso files
 OUTPUT_SUFFIX=""