From 7e1ebd1b2588503d8e2216cee5e7db7d0c70df83 Mon Sep 17 00:00:00 2001 From: Yannick Gicquel Date: Thu, 28 Apr 2016 19:09:19 +0200 Subject: scripts: fix regression on reuse of shell environment variables instead of editing local.conf to defines DL_DIR and SSTATE_DIR, the shell environment variables can be propagated in poky/oe build env. BB_ENV_EXTRAWHITE is defined in "poky/scripts/oe-buildenv-internal" Thus, variable append step should occurs _after_ setup poky/oe. Change-Id: I5d4901435812d2d82950588a89b8ec67f2b01ea8 Signed-off-by: Yannick Gicquel --- scripts/envsetup.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh index b30e0a66b..6ca10de4d 100644 --- a/scripts/envsetup.sh +++ b/scripts/envsetup.sh @@ -77,6 +77,11 @@ else BUILD_DIR=build fi +echo "envsetup: Setup build environment for poky/oe." +echo -e + +source poky/oe-init-build-env $BUILD_DIR + if [ -n "$DL_DIR" ]; then BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR" fi @@ -87,9 +92,4 @@ fi export BB_ENV_EXTRAWHITE -echo "envsetup: Setup build environment for poky/oe." -echo -e - -source poky/oe-init-build-env $BUILD_DIR - unset TEMPLATECONF -- cgit 1.2.3-korg