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 <yannick.gicquel@iot.bzh>

diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index b30e0a6..6ca10de 100644 (file)
--- 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