Upgrade to 64-bit Umbrel OS (#43)

depends

@@ -1,7 +1,7 @@
 quilt
 parted
 realpath:coreutils
-qemu-arm-static:qemu-user-static
+qemu-aarch64-static:qemu-user-static
 debootstrap
 zerofree
 zip
@@ -16,4 +16,4 @@ xxd
 file
 git
 lsmod:kmod
-bc
+bc

export-image/00-allow-rerun/00-run.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
-if [ ! -x "${ROOTFS_DIR}/usr/bin/qemu-arm-static" ]; then
+if [ ! -x "${ROOTFS_DIR}/usr/bin/qemu-aarch64-static" ]; then
-	cp /usr/bin/qemu-arm-static "${ROOTFS_DIR}/usr/bin/"
+	cp /usr/bin/qemu-aarch64-static "${ROOTFS_DIR}/usr/bin/"
 fi
 
 if [ -e "${ROOTFS_DIR}/etc/ld.so.preload" ]; then

scripts/common

@@ -9,17 +9,18 @@ bootstrap(){
 
 	export http_proxy=${APT_PROXY}
 
-	if [ "$(dpkg --print-architecture)" !=  "armhf" ] && [ "$(dpkg --print-architecture)" !=  "aarch64" ]; then
+	if [ "$(dpkg --print-architecture)" !=  "arm64" ]; then
 		BOOTSTRAP_CMD=qemu-debootstrap
 	fi
 
-	BOOTSTRAP_ARGS+=(--arch armhf)
+	BOOTSTRAP_ARGS+=(--arch arm64)
 	BOOTSTRAP_ARGS+=(--components "main,contrib,non-free")
-	BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg")
+	BOOTSTRAP_ARGS+=(--include gnupg)
+	BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/debian.gpg")
 	BOOTSTRAP_ARGS+=("$@")
 	printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}"
 
-	setarch linux32 capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true
+	capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true
 
 	if [ -d "$2/debootstrap" ]; then
 		rmdir "$2/debootstrap"
@@ -90,7 +91,7 @@ on_chroot() {
 		mount --bind /sys "${ROOTFS_DIR}/sys"
 	fi
 
-	setarch linux32 capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
+	capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
 }
 export -f on_chroot
 

stage0/00-configure-apt/00-run.sh

@@ -12,6 +12,7 @@ fi
 
 on_chroot apt-key add - < files/raspberrypi.gpg.key
 on_chroot << EOF
+dpkg --add-architecture armhf
 apt-get update
 apt-get dist-upgrade -y
-EOF
+EOF

stage0/00-configure-apt/files/sources.list

@@ -1,3 +1,7 @@
-deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
+deb http://deb.debian.org/debian buster main contrib non-free
-# Uncomment line below then 'apt-get update' to enable 'apt-get source'
+deb http://deb.debian.org/debian-security/ buster/updates main contrib non-free
-#deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
+deb http://deb.debian.org/debian buster-updates main contrib non-free
+# Uncomment deb-src lines below then 'apt-get update' to enable 'apt-get source'
+#deb-src http://deb.debian.org/debian buster main contrib non-free
+#deb-src http://deb.debian.org/debian-security/ buster/updates main contrib non-free
+#deb-src http://deb.debian.org/debian buster-updates main contrib non-free

stage0/prerun.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -e
 
 if [ ! -d "${ROOTFS_DIR}" ]; then
-	bootstrap buster "${ROOTFS_DIR}" http://raspbian.raspberrypi.org/raspbian/
+	bootstrap buster "${ROOTFS_DIR}" http://deb.debian.org/debian/
 fi

stage1/00-boot-files/files/config.txt

@@ -56,10 +56,8 @@
 # Enable audio (loads snd_bcm2835)
 dtparam=audio=on
 
-[pi4]
 # Enable DRM VC4 V3D driver on top of the dispmanx display stack
 dtoverlay=vc4-fkms-v3d
 max_framebuffers=2
 
-[all]
+arm_64bit=1
-#dtoverlay=vc4-fkms-v3d

stage2/00-copies-and-fills/01-packages

@@ -1 +0,0 @@
-raspi-copies-and-fills

stage2/00-copies-and-fills/02-run.sh

@@ -1,6 +0,0 @@
-#!/bin/bash -e
-
-if [ -f "${ROOTFS_DIR}/etc/ld.so.preload" ]; then
-   mv "${ROOTFS_DIR}/etc/ld.so.preload" "${ROOTFS_DIR}/etc/ld.so.preload.disabled"
-fi
-

stage2/05-docker-compose/01-run.sh

@@ -33,7 +33,7 @@ IMAGES=$(grep '^\s*image' docker-compose.yml | sed 's/image://' | sed 's/\"//g'
 echo "List of images to download: $IMAGES"
 
 while IFS= read -r image; do
-    docker pull --platform=linux/arm/v7 $image
+    docker pull --platform=linux/arm64 $image
 done <<< "$IMAGES"
 
 mkdir -p ${ROOTFS_DIR}/var/lib/docker