Merge pull request #14 from AquaBx/patch-1

Switch to an ARM runner

Author: qzed

.github/workflows/docker.yml

@@ -47,5 +47,6 @@ jobs:
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/image.yml

@@ -14,7 +14,7 @@ env:
 jobs:
   build:
     name: Build default Image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     permissions:
       contents: read
       packages: write
@@ -23,9 +23,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v3
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM archlinux/archlinux
+FROM pkgforge/archlinux
 
 RUN pacman --noconfirm -Syu \
     && pacman --noconfirm -S wget libarchive arch-install-scripts \

lib/base/img.sh

@@ -58,22 +58,21 @@ _img_build() {
     _msg2 "Laying out partitions..."
 
     # compute EFS partition size in MiB
-    efs_size=$(du -bc "${_DIR_DISK_EFI}" | grep total | cut -f1)
-    efs_part_size=$(( (efs_size*105)/100/(1024*1024) + 1))
+    efs_part_size=$(du -s --block-size=1M "${_DIR_DISK_EFI}" | cut -f1)
 
     if [[ $efs_part_size -lt 48 ]]; then
         efs_part_size=48
     fi
 
     # compute root partition size in MiB
-    root_size=$(du -bc "${_DIR_DISK_ROOT}" | grep total | cut -f1)
-    root_part_size=$(( (root_size*110)/100/(1024*1024) + 1))
+    root_size=$(du -s --block-size=1M "${_DIR_DISK_ROOT}" | cut -f1)
+    root_part_size=$(( root_size + 128 ))
 
     # compute disk size and create base image
     _msg2 "Allocating disk image..."
     _IMG_DISK="${_DIR_BUILD}/disk.img"
 
-    disk_size=$(( efs_part_size + root_part_size + 5 ))
+    disk_size=$(( efs_part_size + root_part_size + 8 ))
     dd if=/dev/zero of="${_IMG_DISK}" bs="${disk_size}" count=1048576 status=none
     sync
 

lib/chroot/pacman.sh

@@ -8,7 +8,7 @@ _pacman_setup() {
 
 _pacman_update() {
     _msg1 "Updating the system..."
-    pacman --noconfirm -Syu
+    pacman --noconfirm --disable-sandbox -Syu
 }
 
 _pacman_install() {
@@ -18,7 +18,7 @@ _pacman_install() {
         mapfile -t pkglist < "${_CHROOT_PACKAGES}/install"
 
         if [[ ${#pkglist[@]} -gt 0 ]]; then
-            pacman --noconfirm -S "${pkglist[@]}"
+            pacman --noconfirm --disable-sandbox -S "${pkglist[@]}"
         fi
     fi
 
@@ -29,7 +29,7 @@ _pacman_install() {
         shopt -u nullglob
 
         if [[ ${#pkglist[@]} -gt 0 ]]; then
-            pacman --noconfirm -U "${pkglist[@]}"
+            pacman --noconfirm --disable-sandbox -U "${pkglist[@]}"
         fi
     fi
 }
@@ -41,11 +41,11 @@ _pacman_uninstall() {
         mapfile -t pkglist < "${_CHROOT_PACKAGES}/uninstall"
 
         if [[ ${#pkglist[@]} -gt 0 ]]; then
-            pacman --noconfirm -Rns "${pkglist[@]}"
+            pacman --noconfirm --disable-sandbox -Rns "${pkglist[@]}"
         fi
     fi
 }
 
 _pacman_install_local() {
-    pacman --noconfirm -U "${@}"
+    pacman --noconfirm --disable-sandbox -U "${@}"
 }

lib/modules/linux-surface.sh

@@ -2,7 +2,7 @@
 
 __pacman_install_retry() {
     for i in {1..5}; do
-        if pacman --noconfirm -S "${@}"; then
+        if pacman --noconfirm --disable-sandbox -S "${@}"; then
             break
         fi
 
@@ -30,7 +30,7 @@ Server = https://pkg.surfacelinux.com/arch-aarch64/
 EOF
 
     # update
-    pacman --noconfirm -Syu
+    pacman --noconfirm --disable-sandbox -Syu
 
     # WORKAROUND: This is a workaround for an issue with GitHub CI. Normally,
     # we would install these packages together with the other packages via the