aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorGunnar Andersson <gandersson@genivi.org>2018-04-25 10:26:09 +0200
committerOscar Andreasson <oan@frozentux.net>2018-05-18 08:42:50 +0200
commit3a0785f66f67e43b7a19e342f68581efea9f8e10 (patch)
tree0659890e5b07ad88b5565da5f36ff78f133b4133 /scripts
parent5d8abac0dc1631930f82faed305f3ce40e11f53e (diff)
downloadmeta-ivi-3a0785f66f67e43b7a19e342f68581efea9f8e10.tar.gz
meta-ivi-3a0785f66f67e43b7a19e342f68581efea9f8e10.tar.bz2
meta-ivi-3a0785f66f67e43b7a19e342f68581efea9f8e10.zip
ci-build: Change build/ dir location to parent dir
The script used to place build inside of meta-ivi, (a remnant from GDP where the script is in a "parent" container project). The right location ought to be the directory just above meta-ivi layer directory. Signed-off-by: Gunnar Andersson <gandersson@genivi.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ci-build.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index 705d1f8..2a1ed11 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -234,7 +234,7 @@ trap cleanup SIGINT SIGTERM
D=$(dirname "$0")
cd "$D"
-BASEDIR=$(readlink -f "$PWD/..")
+BASEDIR=$(readlink -f "$PWD/../..") # One dir above meta-ivi!
# The user must define this
ensure_var_is_defined TARGET
@@ -324,12 +324,12 @@ echo "SSTATE_DIR = $DL_DIR"
echo "STANDARD_RELEASE_BUILD" = "$STANDARD_RELEASE_BUILD"
# INIT
-cd "$BASEDIR"
+cd "$BASEDIR/meta-ivi"
echo "*** Initializing layers"
scripts/checkout
echo "*** Initializing conf"
export TEMPLATECONF=$PWD/meta-ivi/conf
-source ../poky/oe-init-build-env build
+source ../poky/oe-init-build-env ../build
# build steps
# We are now in build/
@@ -353,7 +353,7 @@ if [[ "$KEEP_TMP" != "true" ]]; then
rm -rf tmp
fi
-cd "$BASEDIR"
+cd "$BASEDIR/meta-ivi"
# Need to set an identity because if it is unset (which it could be in a CI
# environment), some patching commands will fail the build.