From 385e3bb6ce5c0470cf90d7bf4358dc9f61d64d06 Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Thu, 2 Mar 2023 03:28:35 +0200 Subject: [PATCH] Add arm64 appimage build --- .buildbot/appimage/Dockerfile | 9 +++++---- .buildbot/appimage/build.sh | 10 ++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.buildbot/appimage/Dockerfile b/.buildbot/appimage/Dockerfile index 5de7ed7e..6c2b87d5 100644 --- a/.buildbot/appimage/Dockerfile +++ b/.buildbot/appimage/Dockerfile @@ -7,17 +7,18 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \ build-essential libcap-dev libssl-dev \ python-all-dev python-setuptools wget \ git gtk-update-icon-cache \ - binutils-multiarch crossbuild-essential-armhf + binutils-multiarch crossbuild-essential-armhf crossbuild-essential-arm64 RUN dpkg --add-architecture armhf +RUN dpkg --add-architecture arm64 RUN sed -iE "s|deb |deb [arch=amd64] |g" /etc/apt/sources.list \ - && echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ bionic main universe" >> /etc/apt/sources.list \ - && echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main universe" >> /etc/apt/sources.list + && echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports/ bionic main universe" >> /etc/apt/sources.list \ + && echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main universe" >> /etc/apt/sources.list RUN apt-get update | true -RUN apt-get install -yq libssl-dev:armhf +RUN apt-get install -yq libssl-dev:armhf libssl-dev:arm64 RUN wget -qO appimage-builder-x86_64.AppImage \ https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage diff --git a/.buildbot/appimage/build.sh b/.buildbot/appimage/build.sh index 07cb491b..35bd5ac3 100755 --- a/.buildbot/appimage/build.sh +++ b/.buildbot/appimage/build.sh @@ -27,11 +27,21 @@ set_sourceline ./${BUILDER} --recipe ${RECIPE} || exit 1 export ARCH=armhf +export APPIMAGE_ARCH=${ARCH} export RUNTIME=gnueabihf export CC=arm-linux-gnueabihf-gcc export CXX=${CC} set_sourceline +./${BUILDER} --recipe ${RECIPE} || exit 1 + +export ARCH=arm64 +export APPIMAGE_ARCH=aarch64 +export RUNTIME=${APPIMAGE_ARCH} +export CC=aarch64-linux-gnu-gcc +export CXX=${CC} +set_sourceline + ./${BUILDER} --recipe ${RECIPE} mkdir -p ../out