Use common build scripts in chroot env, too

scripts/chroot/build.sh

@@ -3,53 +3,16 @@
 set -ex
 
 if ! command -v apk; then
-	echo "This script should be run in an Alpine container"
+	echo "This script should be run in an Alpine chroot environment"
 	exit 1
 fi
 
-apk update
-apk add alpine-sdk util-linux strace file autoconf automake libtool xz bash
-
-# Build static libfuse3 with patch for https://github.com/AppImage/type2-runtime/issues/10
-apk add eudev-dev gettext-dev linux-headers meson # From https://git.alpinelinux.org/aports/tree/main/fuse3/APKBUILD
-wget -c -q "https://github.com/libfuse/libfuse/releases/download/fuse-3.15.0/fuse-3.15.0.tar.xz"
-echo "70589cfd5e1cff7ccd6ac91c86c01be340b227285c5e200baa284e401eea2ca0  fuse-3.15.0.tar.xz" | sha256sum -c
-tar xf fuse-3.*.tar.xz
-cd fuse-3.*/
-patch -p1 < ../patches/libfuse/mount.c.diff
-mkdir build
-cd build
-meson setup --prefix=/usr ..
-meson configure --default-library static
-ninja install
-cd ../../
+find /scripts
 
-# Minimize binary size
-export CFLAGS="-ffunction-sections -fdata-sections -Os"
-
-# Build static squashfuse
-apk add zstd-dev zlib-dev zlib-static # fuse3-dev fuse3-static fuse-static fuse-dev
-find / -name "libzstd.*" 2>/dev/null || true
-wget -c -q "https://github.com/vasi/squashfuse/archive/e51978c.tar.gz"
-echo "f544029ad30d8fbde4e4540c574b8cdc6d38b94df025a98d8551a9441f07d341  e51978c.tar.gz" | sha256sum -c
-tar xf e51978c.tar.gz
-cd squashfuse-*/
-./autogen.sh
-./configure --help
-./configure CFLAGS="${CFLAGS} -no-pie" LDFLAGS=-static
-make -j"$(nproc)"
-make install
-/usr/bin/install -c -m 644 ./*.h '/usr/local/include/squashfuse' # ll.h
-cd -
+apk update
+apk add alpine-sdk util-linux strace file autoconf automake libtool xz bash \
+    eudev-dev gettext-dev linux-headers meson \
+    zstd-dev zlib-dev zlib-static # fuse3-dev fuse3-static fuse-static fuse-dev
 
-# Build static AppImage runtime
-GIT_COMMIT="$(cat src/runtime/version)"
-export GIT_COMMIT
-cd src/runtime
-make runtime -j"$(nproc)"
-file runtime
-objcopy --only-keep-debug runtime runtime.debug
-strip runtime
-ls -lh runtime runtime.debug
-echo -ne 'AI\x02' | dd of=runtime bs=1 count=3 seek=8 conv=notrunc # magic bytes, always do AFTER strip
-cd -
+/scripts/common/install-dependencies.sh
+/scripts/build-runtime.sh

scripts/chroot/chroot_build.sh

@@ -53,17 +53,21 @@ sudo cp -p /etc/resolv.conf miniroot/etc/
 # Run build.sh in chroot
 #############################################
 
+# copy build scripts so that they are available within the chroot environment
+# build.sh combines existing scripts shared by all available build environments
+sudo cp -R "$repo_root_dir"/scripts miniroot/scripts
+
 if [ "$ALPINE_ARCH" = "x86" ] || [ "$ALPINE_ARCH" = "x86_64" ]; then
     echo "Architecture is x86 or x86_64, hence not using qemu-arm-static"
-    sudo cp "$repo_root_dir"/scripts/chroot/build.sh miniroot/build.sh && sudo chroot miniroot /bin/sh -ex /build.sh
+    sudo chroot miniroot /bin/sh -ex /scripts/chroot/build.sh
 elif [ "$ALPINE_ARCH" = "aarch64" ] ; then
     echo "Architecture is aarch64, hence using qemu-aarch64-static"
     sudo cp "$(which qemu-aarch64-static)" miniroot/usr/bin
-    sudo cp "$repo_root_dir"/scripts/chroot/build.sh miniroot/build.sh && sudo chroot miniroot qemu-aarch64-static /bin/sh -ex /build.sh
+    sudo chroot miniroot qemu-aarch64-static /bin/sh -ex /scripts/chroot/build.sh
 elif [ "$ALPINE_ARCH" = "armhf" ] ; then
     echo "Architecture is armhf, hence using qemu-arm-static"
     sudo cp "$(which qemu-arm-static)" miniroot/usr/bin
-    sudo cp "$repo_root_dir"/scripts/chroot/build.sh miniroot/build.sh && sudo chroot miniroot qemu-arm-static /bin/sh -ex /build.sh
+    sudo cp "$repo_root_dir"/scripts/chroot/build.sh miniroot/build.sh && sudo chroot miniroot qemu-arm-static /bin/sh -ex /scripts/chroot/build.sh
 else
     echo "Edit chroot_build.sh to support this architecture as well, it should be easy"
     exit 1