Skip to content

Commit 8fa9da4

Browse files
author
Lee Miller
committed
Fix cross-compilation in the appimage build script and simplify local building
1 parent f28935f commit 8fa9da4

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

.buildbot/appimage/build.sh

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,45 @@ function set_sourceline {
1414
fi
1515
}
1616

17+
function build_appimage {
18+
set_sourceline
19+
./${BUILDER} --recipe ${RECIPE} || exit 1
20+
rm -rf build
21+
}
22+
1723
[ -f ${BUILDER} ] || wget -qO ${BUILDER} \
1824
https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage \
1925
&& chmod +x ${BUILDER}
2026

27+
chmod 1777 /tmp
2128

2229
export ARCH=amd64
2330
export APPIMAGE_ARCH=x86_64
2431
export RUNTIME=${APPIMAGE_ARCH}
25-
set_sourceline
2632

27-
./${BUILDER} --recipe ${RECIPE} || exit 1
33+
build_appimage
2834

2935
export ARCH=armhf
3036
export APPIMAGE_ARCH=${ARCH}
3137
export RUNTIME=gnueabihf
3238
export CC=arm-linux-gnueabihf-gcc
3339
export CXX=${CC}
34-
set_sourceline
3540

36-
./${BUILDER} --recipe ${RECIPE} || exit 1
41+
build_appimage
3742

3843
export ARCH=arm64
3944
export APPIMAGE_ARCH=aarch64
4045
export RUNTIME=${APPIMAGE_ARCH}
4146
export CC=aarch64-linux-gnu-gcc
4247
export CXX=${CC}
43-
set_sourceline
4448

45-
./${BUILDER} --recipe ${RECIPE}
49+
build_appimage
4650

47-
mkdir -p ../out
48-
sha256sum PyBitmessage*.AppImage > ../out/SHA256SUMS
51+
EXISTING_OWNER=$(stat -c %u ../out) || mkdir -p ../out
52+
53+
sha256sum PyBitmessage*.AppImage >> ../out/SHA256SUMS
4954
cp PyBitmessage*.AppImage ../out
55+
56+
if [ ${EXISTING_OWNER} ]; then
57+
chown ${EXISTING_OWNER} ../out/PyBitmessage*.AppImage ../out/SHA256SUMS
58+
fi

0 commit comments

Comments
 (0)