From 9845b57f2a4ab5ed4add41e6b645972225886471 Mon Sep 17 00:00:00 2001 From: NicJA Date: Fri, 21 Apr 2017 01:50:40 +0000 Subject: [PATCH] synch with bootiso behaviour git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@54581 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- scripts/nightly/pkg/hosted | 12 +++++++++++- scripts/nightly/pkg/hosted-android-arm | 3 ++- scripts/nightly/pkg/hosted-darwin-i386 | 3 ++- scripts/nightly/pkg/hosted-darwin-ppc | 3 ++- scripts/nightly/pkg/hosted-darwin-x86_64 | 3 ++- scripts/nightly/pkg/hosted-linux-arm | 3 ++- scripts/nightly/pkg/hosted-linux-armhf | 3 ++- scripts/nightly/pkg/hosted-linux-i386 | 3 ++- scripts/nightly/pkg/hosted-linux-ppc | 3 ++- scripts/nightly/pkg/hosted-linux-x86_64 | 3 ++- scripts/nightly/pkg/hosted-mingw32-i386 | 3 ++- scripts/nightly/pkg/hosted-mingw32-x86_64 | 3 ++- 12 files changed, 33 insertions(+), 12 deletions(-) diff --git a/scripts/nightly/pkg/hosted b/scripts/nightly/pkg/hosted index 2aa86763b5..83a8ddcd36 100644 --- a/scripts/nightly/pkg/hosted +++ b/scripts/nightly/pkg/hosted @@ -18,8 +18,18 @@ if [ -z ${BUILDTARGETDIR+x} ]; then BUILDTARGETDIR=$BUILDTARGET; fi delete $BUILD_BASE/AROS copy $SOURCE_AROS $BUILD_BASE/AROS +CONFIGURE_OPTIONS="--target=$BUILDTARGET" +if [[ "$VARIANT" != "" ]]; then + CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --enable-target-variant=$VARIANT" +fi +CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $BUILDEXTRAOPTS $CONFIGUREEXTRA --enable-ccache" +if [[ ( "$AROSTOOLCHAININSTALLOPT" != "" ) && -e $TOOLCHAIN_BASE/$BUILDCPU-aros-gcc ]]; then + CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $AROSTOOLCHAININSTALLOPT $AROSTOOLCHAINOPT" +fi +CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --enable-build-type=nightly $PORTSSOURCESOPT" + cd $BUILD_BASE/AROS -execute ./configure --target=$BUILDTARGET $BUILDEXTRAOPTS --enable-ccache --enable-build-type=nightly $PORTSSOURCESOPT $AROSTOOLCHAININSTALLOPT $AROSTOOLCHAINOPT +execute ./configure ${=CONFIGURE_OPTIONS} make -j $MAKE_JOBS make -j $MAKE_JOBS default-x11keymaptable diff --git a/scripts/nightly/pkg/hosted-android-arm b/scripts/nightly/pkg/hosted-android-arm index 9f44f8e05c..622145bf42 100755 --- a/scripts/nightly/pkg/hosted-android-arm +++ b/scripts/nightly/pkg/hosted-android-arm @@ -1,7 +1,8 @@ #!/bin/zsh # Creates generic "hosted" binary packages. -BUILDTARGET=android-arm +BUILDCPU=arm +BUILDTARGET=android-$BUILDCPU source $SP/setup # The log-name MUST match the name of the package script diff --git a/scripts/nightly/pkg/hosted-darwin-i386 b/scripts/nightly/pkg/hosted-darwin-i386 index 95534c3c2b..f7c10ed34a 100755 --- a/scripts/nightly/pkg/hosted-darwin-i386 +++ b/scripts/nightly/pkg/hosted-darwin-i386 @@ -1,6 +1,7 @@ #!/bin/zsh # Creates darwin-i386 "hosted" binary packages. -BUILDTARGET=darwin-i386 +BUILDCPU=i386 +BUILDTARGET=darwin-$BUILDCPU source $SP/pkg/hosted diff --git a/scripts/nightly/pkg/hosted-darwin-ppc b/scripts/nightly/pkg/hosted-darwin-ppc index 6d55a73153..dd661b0c0b 100755 --- a/scripts/nightly/pkg/hosted-darwin-ppc +++ b/scripts/nightly/pkg/hosted-darwin-ppc @@ -1,7 +1,8 @@ #!/bin/zsh # Creates darwin-ppc "hosted" binary packages. -BUILDTARGET=darwin-ppc +BUILDCPU=ppc +BUILDTARGET=darwin-$BUILDCPU BUILDEXTRAOPTS=(--with-kernel-gcc-version=4.2.1) source $SP/pkg/hosted diff --git a/scripts/nightly/pkg/hosted-darwin-x86_64 b/scripts/nightly/pkg/hosted-darwin-x86_64 index 6e547c357e..f2e8927d00 100755 --- a/scripts/nightly/pkg/hosted-darwin-x86_64 +++ b/scripts/nightly/pkg/hosted-darwin-x86_64 @@ -1,7 +1,8 @@ #!/bin/zsh # Creates darwin-x86-64 "hosted" binary packages. -BUILDTARGET=darwin-x86_64 +BUILDCPU=x86_64 +BUILDTARGET=darwin-$BUILDCPU BUILDEXTRAOPTS=(--with-kernel-gcc-version=4.2.1) source $SP/pkg/hosted diff --git a/scripts/nightly/pkg/hosted-linux-arm b/scripts/nightly/pkg/hosted-linux-arm index bb5b8d54cf..a872137b5c 100755 --- a/scripts/nightly/pkg/hosted-linux-arm +++ b/scripts/nightly/pkg/hosted-linux-arm @@ -1,7 +1,8 @@ #!/bin/zsh # Creates linux-arm "hosted" binary packages. -BUILDTARGET=linux-arm +BUILDCPU=arm +BUILDTARGET=linux-$BUILDCPU BUILDEXTRAOPTS=(--enable-includes=/opt/cross/sys-root/arm-linux-gnueabi/usr/include --x-includes=/opt/cross/sys-root/arm-linux-gnueabi/usr/include --x-libraries=/opt/cross/sys-root/arm-linux-gnueabi/usr/lib) source $SP/pkg/hosted diff --git a/scripts/nightly/pkg/hosted-linux-armhf b/scripts/nightly/pkg/hosted-linux-armhf index 62ea965763..ffec5bc982 100755 --- a/scripts/nightly/pkg/hosted-linux-armhf +++ b/scripts/nightly/pkg/hosted-linux-armhf @@ -1,7 +1,8 @@ #!/bin/zsh # Creates linux-armhf "hosted" binary packages. -BUILDTARGET=linux-armhf +BUILDCPU=armhf +BUILDTARGET=linux-$BUILDCPU BUILDTARGETDIR=linux-arm BUILDEXTRAOPTS=(--enable-includes=/usr/arm-linux-gnueabihf/include/ --x-includes=/usr/arm-linux-gnueabihf/sysroot/usr/include --x-libraries=/usr/arm-linux-gnueabihf/sysroot/usr/lib) diff --git a/scripts/nightly/pkg/hosted-linux-i386 b/scripts/nightly/pkg/hosted-linux-i386 index e99233ab50..d09bfa2798 100755 --- a/scripts/nightly/pkg/hosted-linux-i386 +++ b/scripts/nightly/pkg/hosted-linux-i386 @@ -1,7 +1,8 @@ #!/bin/zsh # Creates linux-i386 "hosted" binary packages. -BUILDTARGET=linux-i386 +BUILDCPU=i386 +BUILDTARGET=linux-$BUILDCPU TESTEXE=boot/linux/AROSBootstrap TESTARGS="mungwall" TESTTIMEOUT=5m diff --git a/scripts/nightly/pkg/hosted-linux-ppc b/scripts/nightly/pkg/hosted-linux-ppc index 2dffbdd964..eaf1c62ae6 100644 --- a/scripts/nightly/pkg/hosted-linux-ppc +++ b/scripts/nightly/pkg/hosted-linux-ppc @@ -1,6 +1,7 @@ #!/bin/zsh # Creates linux-ppc "hosted" binary packages. -BUILDTARGET=linux-ppc +BUILDCPU=ppc +BUILDTARGET=linux-$BUILDCPU source $SP/pkg/hosted diff --git a/scripts/nightly/pkg/hosted-linux-x86_64 b/scripts/nightly/pkg/hosted-linux-x86_64 index 18a8a0535f..e9836cdfb6 100755 --- a/scripts/nightly/pkg/hosted-linux-x86_64 +++ b/scripts/nightly/pkg/hosted-linux-x86_64 @@ -3,6 +3,7 @@ CONFIGUREEXTRA="--with-binutils-version=2.25 --with-gcc-version=6.3.0" -BUILDTARGET=linux-x86_64 +BUILDCPU=x86_64 +BUILDTARGET=linux-$BUILDCPU source $SP/pkg/hosted diff --git a/scripts/nightly/pkg/hosted-mingw32-i386 b/scripts/nightly/pkg/hosted-mingw32-i386 index 20197bc524..b408da615d 100755 --- a/scripts/nightly/pkg/hosted-mingw32-i386 +++ b/scripts/nightly/pkg/hosted-mingw32-i386 @@ -1,7 +1,8 @@ #!/bin/zsh # Creates mingw32-i386 "hosted" binary packages. -BUILDTARGET=mingw32-i386 +BUILDCPU=i386 +BUILDTARGET=mingw32-$BUILDCPU source $SP/setup # The log-name MUST match the name of the package script diff --git a/scripts/nightly/pkg/hosted-mingw32-x86_64 b/scripts/nightly/pkg/hosted-mingw32-x86_64 index 41dec621eb..55710c9fc5 100755 --- a/scripts/nightly/pkg/hosted-mingw32-x86_64 +++ b/scripts/nightly/pkg/hosted-mingw32-x86_64 @@ -1,7 +1,8 @@ #!/bin/zsh # Creates mingw32-x86_64 "hosted" binary packages. -BUILDTARGET=mingw32-x86_64 +BUILDCPU=x86_64 +BUILDTARGET=mingw32-$BUILDCPU source $SP/setup # The log-name MUST match the name of the package script -- 2.11.4.GIT