Skip to content

Commit 408b6f1

Browse files
authored
feat: support building via Docker on aarch64 (#25)
1 parent beee75f commit 408b6f1

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

Dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
FROM ghcr.io/void-linux/void-glibc:20250401r1
1+
FROM ghcr.io/void-linux/void-glibc:20250801R1
22
LABEL org.opencontainers.image.licenses="Apache-2.0"
33

4-
RUN echo "repository=https://mirrors.servercentral.com/voidlinux/current" > /etc/xbps.d/00-repository-main.conf
4+
# https://docs.voidlinux.org/xbps/repositories/mirrors/changing.html
5+
RUN mkdir -p /etc/xbps.d && \
6+
cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/ && \
7+
sed -i 's|https://repo-default.voidlinux.org|https://mirrors.servercentral.com/voidlinux|g' /etc/xbps.d/*-repository-*.conf
58

69
RUN xbps-install -Suy xbps
10+
711
RUN xbps-install -uy bash curl dosfstools e2fsprogs findutils util-linux gzip \
8-
git m4 mtools pigz tar zstd xz zip mkpasswd zip unzip prelink just rsync \
9-
autoconf automake libtool pkg-config make gcc confuse-devel openssl
12+
git m4 mtools pigz tar zstd xz zip mkpasswd zip unzip just rsync \
13+
autoconf automake libtool pkg-config make gcc confuse-devel openssl patchelf
1014

1115
RUN curl -L https://github.com/pengutronix/genimage/archive/refs/tags/v18.tar.gz | tar --use-compress-program=pigz -x -C /tmp \
1216
&& cd /tmp/genimage-18 \

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ set -e
2727
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
2828
# Static config
2929
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
30-
REQUIRED_CMDS=(curl zip unzip genimage m4 xbps-install mkpasswd execstack)
30+
REQUIRED_CMDS=(curl zip unzip genimage m4 xbps-install mkpasswd patchelf)
3131
for cmd in "${REQUIRED_CMDS[@]}"; do
3232
if ! command -v "$cmd" > /dev/null 2>&1; then
3333
echo "$cmd is required to run this script."

scripts/stages/00/50-stock-files.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ ln -sf libfontconfig.so.1.12.0 "$ROOTFS_PATH"/usr/lib/libfontconfig.so.1
3232
ln -sf libfreetype.so.6.16.1 "$ROOTFS_PATH"/usr/lib/libfreetype.so.6
3333
ln -sf libpng16.so.16.36.0 "$ROOTFS_PATH"/usr/lib/libpng16.so.16
3434

35-
execstack -c "$ROOTFS_PATH"/usr/lib/libMali.so
35+
# Use patchelf to clear executable stack flag (equivalent to execstack -c)
36+
patchelf --clear-execstack "$ROOTFS_PATH"/usr/lib/libMali.so

0 commit comments

Comments
 (0)