From 276bdb0ef73bae0d9387050e03ae7327f0714dd0 Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Sat, 31 Aug 2019 21:34:17 +0200 Subject: [PATCH] Fix export and configuarable in build script in base platform --- BasePlatform/v1/build.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/BasePlatform/v1/build.sh b/BasePlatform/v1/build.sh index f15440d..bd36593 100755 --- a/BasePlatform/v1/build.sh +++ b/BasePlatform/v1/build.sh @@ -2,18 +2,25 @@ CONF_PATH=`dirname $0` +if [ -z "$BUILD_DIR_32BIT" ]; then + BUILD_DIR_32BIT=build32 +fi +if [ -z "$BUILD_DIR_64BIT" ]; then + BUILD_DIR_64BIT=build64 +fi + if [ -z "$NO_32BIT" ]; then if [ -z $2 ]; then - flatpak-builder $1 --require-changes --arch=i386 build32 "$CONF_PATH/BaseSdk-i386.yaml" || exit 1 + flatpak-builder $1 --require-changes --arch=i386 "$BUILD_DIR_32BIT" "$CONF_PATH/BaseSdk-i386.yaml" || exit 1 else - flatpak-builder $1 --require-changes --arch=i386 --gpg-sign=winebarrels@marko10-000.de "--repo=$2" build32 "$CONF_PATH/BaseSdk-i386.yaml" || exit 1 + flatpak-builder $1 --arch=i386 --gpg-sign=winebarrels@marko10-000.de "--repo=$2" "$BUILD_DIR_32BIT" "$CONF_PATH/BaseSdk-i386.yaml" || exit 1 fi fi if [ -z "$NO_64BIT" ]; then ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Platform.Compat.i386/x86_64/18.08 > "$CONF_PATH/i386.tar" || exit 2 if [ -z $2 ]; then - flatpak-builder $1 --require-changes --arch=x86_64 build64 "$CONF_PATH/BaseSdk-x86_64.yaml" || exit 2 + flatpak-builder $1 --require-changes --arch=x86_64 "$BUILD_DIR_64BIT" "$CONF_PATH/BaseSdk-x86_64.yaml" || exit 2 else - flatpak-builder $1 --require-changes --arch=x86_64 --gpg-sign=winebarrels@marko10-000.de "--repo=$2" build64 "$CONF_PATH/BaseSdk-x86_64.yaml" || exit 2 + flatpak-builder $1 --arch=x86_64 --gpg-sign=winebarrels@marko10-000.de "--repo=$2" "$BUILD_DIR_64BIT" "$CONF_PATH/BaseSdk-x86_64.yaml" || exit 2 fi fi