Merge branch 'main' into probonopd-patch-1

AppImage · Dec 20, 2024 · 36561a2 · 36561a2
2 parents 154bd90 + 9fad133
commit 36561a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/scripts/chroot/build.sh b/scripts/chroot/build.sh
@@ -12,7 +12,7 @@ find /scripts
 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 clang
+    zstd-dev zstd-static zlib-dev zlib-static clang
 
 /scripts/common/install-dependencies.sh
 /scripts/build-runtime.sh
diff --git a/scripts/chroot/chroot_build.sh b/scripts/chroot/chroot_build.sh
@@ -35,7 +35,11 @@ cd "$tempdir"
 # Download and extract minimal Alpine system
 #############################################
 
-wget "http://dl-cdn.alpinelinux.org/alpine/v3.17/releases/${ALPINE_ARCH}/alpine-minirootfs-3.17.2-${ALPINE_ARCH}.tar.gz"
+ALPINE_RELEASE="3.21.0"
+wget "http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_RELEASE%.*}/releases/${ALPINE_ARCH}/alpine-minirootfs-${ALPINE_RELEASE}-${ALPINE_ARCH}.tar.gz"
+wget "http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_RELEASE%.*}/releases/${ALPINE_ARCH}/alpine-minirootfs-${ALPINE_RELEASE}-${ALPINE_ARCH}.tar.gz.sha256"
+sha256sum -c alpine-minirootfs-${ALPINE_RELEASE}-${ALPINE_ARCH}.tar.gz.sha256
+
 mkdir -p ./miniroot
 cd ./miniroot
 sudo tar xf ../alpine-minirootfs-*-"${ALPINE_ARCH}".tar.gz
@@ -94,4 +98,4 @@ esac
 cd "$repo_root_dir"
 mkdir -p ./out/
 cp "${tempdir}/miniroot/out/runtime-${appimage_arch}" out/
-cp "${tempdir}/miniroot/out/runtime-${appimage_arch}.debug" out/
+cp "${tempdir}/miniroot/out/runtime-${appimage_arch}.debug" out/