From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6787079713742389248 Date: Mon, 25 May 2020 19:54:57 -0700 (PDT) From: vijai kumar To: isar-users Message-Id: In-Reply-To: <20200427102837.1755-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200427102837.1755-1-Vijaikumar_Kanagarajan@mentor.com> Subject: Re: [PATCH v3] Replace ISARROOT with more relevant variables MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_1545_736803039.1590461698000" X-Google-Token: EIGKsvYF91bdBClY8kM0 X-Google-IP: 106.51.233.83 X-TUID: lX0QcVkKluUd ------=_Part_1545_736803039.1590461698000 Content-Type: multipart/alternative; boundary="----=_Part_1546_1258025027.1590461698000" ------=_Part_1546_1258025027.1590461698000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Any review comments on this? Thanks, Vijai Kumar K On Monday, April 27, 2020 at 3:59:07 PM UTC+5:30, vijai kumar wrote: > > From: Vijai Kumar K > > When switching between two ISAR workspaces in the same shell > session, the ISARROOT setting of the previous workspace would be > picked up for the new workspace resulting in an incorrect > configuration. The user had to manually unset ISARROOT to avoid > any issues. > > As like OEROOT in OE, let us unset ISARROOT at the end of the > initialization script. This helps us to avoid the above issue > and also preserves support for passing ISARROOT from a caller > script as in OE. > > ISARROOT is used mostly to derive the location of bitbake, scripts, > testsuite, meta and meta-isar directories. > > Layers like meta, meta-isar already have their paths in LAYERDIR_core > and LAYERDIR_isar which can be used. For other directories introduce > dedicated variables BITBAKEDIR, SCRIPTSDIR and TESTSUITEDIR. > > Signed-off-by: Vijai Kumar K > --- > Changes in v3: > - Send patch using proper send. > Changes in v2: > - Approach using dedicated variables for each commonly used > directories. > > isar-init-build-env | 1 + > meta/classes/image-sdk-extension.bbclass | 2 +- > meta/classes/wic-img.bbclass | 31 ++++++++++++------------ > scripts/ci_build.sh | 12 +++++---- > scripts/isar-buildenv-internal | 7 ++++-- > 5 files changed, 30 insertions(+), 23 deletions(-) > > diff --git a/isar-init-build-env b/isar-init-build-env > index b08bb59..85fb82f 100755 > --- a/isar-init-build-env > +++ b/isar-init-build-env > @@ -55,5 +55,6 @@ export ISARROOT > unset ISARROOT > return 1 > } > +unset ISARROOT > > [ -z "$BUILDDIR" ] || cd "$BUILDDIR" > diff --git a/meta/classes/image-sdk-extension.bbclass > b/meta/classes/image-sdk-extension.bbclass > index b9f2cf4..b91fdd6 100644 > --- a/meta/classes/image-sdk-extension.bbclass > +++ b/meta/classes/image-sdk-extension.bbclass > @@ -19,7 +19,7 @@ do_populate_sdk() { > sudo rm -f ${SDKCHROOT_DIR}/chroot-setup.sh > ${SDKCHROOT_DIR}/configscript.sh > > # Copy mount_chroot.sh for convenience > - sudo cp ${ISARROOT}/scripts/mount_chroot.sh ${SDKCHROOT_DIR} > + sudo cp ${SCRIPTSDIR}/mount_chroot.sh ${SDKCHROOT_DIR} > > # Create SDK archive > cd -P ${SDKCHROOT_DIR}/.. > diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass > index afab394..1bb1021 100644 > --- a/meta/classes/wic-img.bbclass > +++ b/meta/classes/wic-img.bbclass > @@ -86,7 +86,7 @@ STAGING_DATADIR ?= "/usr/lib/" > STAGING_LIBDIR ?= "/usr/lib/" > STAGING_DIR ?= "${TMPDIR}" > IMAGE_BASENAME ?= "${PN}-${DISTRO}" > -FAKEROOTCMD ?= "${ISARROOT}/scripts/wic_fakeroot" > +FAKEROOTCMD ?= "${SCRIPTSDIR}/wic_fakeroot" > RECIPE_SYSROOT_NATIVE ?= "/" > BUILDCHROOT_DIR = "${BUILDCHROOT_TARGET_DIR}" > > @@ -132,7 +132,7 @@ do_wic_image() { > buildchroot_do_mounts > sudo -s <<'EOSUDO' > ( flock 9 > - for dir in ${BBLAYERS} ${STAGING_DIR} ${ISARROOT}/scripts > ${ISARROOT}/bitbake; do > + for dir in ${BBLAYERS} ${STAGING_DIR} ${SCRIPTSDIR} > ${BITBAKEDIR}; do > mkdir -p ${BUILDCHROOT_DIR}/$dir > if ! mountpoint ${BUILDCHROOT_DIR}/$dir >/dev/null 2>&1; then > mount --bind --make-private $dir ${BUILDCHROOT_DIR}/$dir > @@ -149,25 +149,26 @@ EOSUDO > > sudo -E chroot ${BUILDCHROOT_DIR} \ > sh -c ' \ > - ISARROOT="$1" > - WKS_FULL_PATH="$2" > - STAGING_DIR="$3" > - MACHINE="$4" > - WICTMP="$5" > - IMAGE_FULLNAME="$6" > - IMAGE_BASENAME="$7" > - shift 7 > - > - export PATH="$ISARROOT/bitbake/bin:$PATH" > - "$ISARROOT"/scripts/wic create "$WKS_FULL_PATH" \ > + BITBAKEDIR="$1" > + SCRIPTSDIR="$2" > + WKS_FULL_PATH="$3" > + STAGING_DIR="$4" > + MACHINE="$5" > + WICTMP="$6" > + IMAGE_FULLNAME="$7" > + IMAGE_BASENAME="$8" > + shift 8 > + > + export PATH="$BITBAKEDIR/bin:$PATH" > + "$SCRIPTSDIR"/wic create "$WKS_FULL_PATH" \ > --vars "$STAGING_DIR/$MACHINE/imgdata/" \ > -o "/$WICTMP/${IMAGE_FULLNAME}.wic/" \ > --bmap \ > -e "$IMAGE_BASENAME" $@' \ > - my_script "${ISARROOT}" "${WKS_FULL_PATH}" "${STAGING_DIR}" > \ > + my_script "${BITBAKEDIR}" "${SCRIPTSDIR}" > "${WKS_FULL_PATH}" "${STAGING_DIR}" \ > "${MACHINE}" "${WICTMP}" "${IMAGE_FULLNAME}" > "${IMAGE_BASENAME}" \ > ${WIC_CREATE_EXTRA_ARGS} > - sudo chown -R $(stat -c "%U" ${ISARROOT}) ${ISARROOT}/meta > ${ISARROOT}/meta-isar ${ISARROOT}/scripts || true > + sudo chown -R $(stat -c "%U" ${LAYERDIR_core}) ${LAYERDIR_core} > ${LAYERDIR_isar} ${SCRIPTSDIR} || true > WIC_DIRECT=$(ls -t -1 > ${BUILDCHROOT_DIR}/$WICTMP/${IMAGE_FULLNAME}.wic/*.direct | head -1) > sudo chown -R $(id -u):$(id -g) ${BUILDCHROOT_DIR}/${WICTMP} > mv -f ${WIC_DIRECT} ${WIC_IMAGE_FILE} > diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh > index adc403b..d15aba9 100755 > --- a/scripts/ci_build.sh > +++ b/scripts/ci_build.sh > @@ -138,8 +138,8 @@ if [ -n "$CROSS_BUILD" ]; then > fi > > if [ -n "$REPRO_BUILD" ]; then > - > ISAR_TESTSUITE_GPG_PUB_KEY_FILE="$ISARROOT/testsuite/base-apt/test_pub.key" > > - > ISAR_TESTSUITE_GPG_PRIV_KEY_FILE="$ISARROOT/testsuite/base-apt/test_priv.key" > > + ISAR_TESTSUITE_GPG_PUB_KEY_FILE="$TESTSUITEDIR/base-apt/test_pub.key" > + > ISAR_TESTSUITE_GPG_PRIV_KEY_FILE="$TESTSUITEDIR/base-apt/test_priv.key" > export GNUPGHOME=$(mktemp -d) > gpg --import $ISAR_TESTSUITE_GPG_PUB_KEY_FILE > $ISAR_TESTSUITE_GPG_PRIV_KEY_FILE > > @@ -187,9 +187,11 @@ if [ -z "$FAST_BUILD" ]; then > bitbake $BB_ARGS $TARGETS_SET > fi > > -cp -a "${ISARROOT}/meta/classes/dpkg-base.bbclass" > "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup" > -echo -e "do_fetch_append() {\n\n}" >> > "${ISARROOT}/meta/classes/dpkg-base.bbclass" > +eval $(bitbake -e | grep "^LAYERDIR_core=") > + > +cp -a "${LAYERDIR_core}/classes/dpkg-base.bbclass" > "${LAYERDIR_core}/classes/dpkg-base.bbclass.ci-backup" > +echo -e "do_fetch_append() {\n\n}" >> > "${LAYERDIR_core}/classes/dpkg-base.bbclass" > > bitbake $BB_ARGS mc:qemuamd64-stretch:isar-image-base > > -mv "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup" > "${ISARROOT}/meta/classes/dpkg-base.bbclass" > +mv "${LAYERDIR_core}/classes/dpkg-base.bbclass.ci-backup" > "${LAYERDIR_core}/classes/dpkg-base.bbclass" > diff --git a/scripts/isar-buildenv-internal > b/scripts/isar-buildenv-internal > index 72a91ab..fe1e65f 100755 > --- a/scripts/isar-buildenv-internal > +++ b/scripts/isar-buildenv-internal > @@ -59,8 +59,11 @@ fi > unset BDIR > > export BUILDDIR > +export BITBAKEDIR="${ISARROOT}/bitbake" > +export SCRIPTSDIR="${ISARROOT}/scripts" > +export TESTSUITEDIR="${ISARROOT}/testsuite" > > -for newpath in "$ISARROOT/bitbake/bin" "$ISARROOT/scripts"; do > +for newpath in "$BITBAKEDIR/bin" "$SCRIPTSDIR"; do > # Remove any existences of $newpath from $PATH > PATH=$(echo $PATH | sed -re "s#(^|:)$newpath(:|$)#\2#g;s#^:##") > > @@ -74,5 +77,5 @@ export PATH > BBPATH="${BUILDDIR}" > export BBPATH > > -BB_ENV_EXTRAWHITE="BUILDDIR ISARROOT http_proxy https_proxy ftp_proxy > no_proxy GNUPGHOME" > +BB_ENV_EXTRAWHITE="BUILDDIR BITBAKEDIR SCRIPTSDIR TESTSUITEDIR http_proxy > https_proxy ftp_proxy no_proxy GNUPGHOME" > export BB_ENV_EXTRAWHITE > -- > 2.17.1 > > ------=_Part_1546_1258025027.1590461698000 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
Any review comments on this?

Thanks,
Vijai Kumar K

On Monday, April 27, 2020 at 3:59:07 PM UTC+5:= 30, vijai kumar wrote:
From: Vi= jai Kumar K <Vijaikumar_Kanag= arajan@mentor.com>

When switching between two ISAR workspaces in the same shell
session, the ISARROOT setting of the previous workspace would be
picked up for the new workspace resulting in an incorrect
configuration. The user had to manually unset ISARROOT to avoid
any issues.

As like OEROOT in OE, let us unset ISARROOT at the end of the
initialization script. This helps us to avoid the above issue
and also preserves support for passing ISARROOT from a caller
script as in OE.

ISARROOT is used mostly to derive the location of bitbake, scripts,
testsuite, meta and meta-isar directories.

Layers like meta, meta-isar already have their paths in LAYERDIR_core
and LAYERDIR_isar which can be used. For other directories introduce
dedicated variables BITBAKEDIR, SCRIPTSDIR and TESTSUITEDIR.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
Changes in v3:
=C2=A0 =C2=A0 - Send patch using proper send.
Changes in v2:
=C2=A0 =C2=A0 - Approach using dedicated variables for each commonly us= ed
directories.

=C2=A0isar-init-build-env =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2=A01 +
=C2=A0meta/classes/image-sdk-extension.bbclass | =C2=A02 +-
=C2=A0meta/classes/wic-img.bbclass =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 | 31 ++++++++++++------------
=C2=A0scripts/ci_build.sh =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 12 +++++----
=C2=A0scripts/isar-buildenv-internal =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 | =C2=A07 ++++--
=C2=A05 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/isar-init-build-env b/isar-init-build-env
index b08bb59..85fb82f 100755
--- a/isar-init-build-env
+++ b/isar-init-build-env
@@ -55,5 +55,6 @@ export ISARROOT
=C2=A0 =C2=A0 =C2=A0unset ISARROOT
=C2=A0 =C2=A0 =C2=A0return 1
=C2=A0}
+unset ISARROOT
=C2=A0
=C2=A0[ -z "$BUILDDIR" ] || cd "$BUILDDIR"
diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/class= es/image-sdk-extension.bbclass
index b9f2cf4..b91fdd6 100644
--- a/meta/classes/image-sdk-extension.bbclass
+++ b/meta/classes/image-sdk-extension.bbclass
@@ -19,7 +19,7 @@ do_populate_sdk() {
=C2=A0 =C2=A0 =C2=A0sudo rm -f ${SDKCHROOT_DIR}/chroot-setup.sh ${= SDKCHROOT_DIR}/configscript.sh
=C2=A0
=C2=A0 =C2=A0 =C2=A0# Copy mount_chroot.sh for convenience
- =C2=A0 =C2=A0sudo cp ${ISARROOT}/scripts/mount_chroot.sh ${SDKCH= ROOT_DIR}
+ =C2=A0 =C2=A0sudo cp ${SCRIPTSDIR}/mount_chroot.sh ${SDKCHROOT_DIR}
=C2=A0
=C2=A0 =C2=A0 =C2=A0# Create SDK archive
=C2=A0 =C2=A0 =C2=A0cd -P ${SDKCHROOT_DIR}/..
diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclas= s
index afab394..1bb1021 100644
--- a/meta/classes/wic-img.bbclass
+++ b/meta/classes/wic-img.bbclass
@@ -86,7 +86,7 @@ STAGING_DATADIR ?=3D "/usr/lib/"
=C2=A0STAGING_LIBDIR ?=3D "/usr/lib/"
=C2=A0STAGING_DIR ?=3D "${TMPDIR}"
=C2=A0IMAGE_BASENAME ?=3D "${PN}-${DISTRO}"
-FAKEROOTCMD ?=3D "${ISARROOT}/scripts/wic_fakeroot"
+FAKEROOTCMD ?=3D "${SCRIPTSDIR}/wic_fakeroot"
=C2=A0RECIPE_SYSROOT_NATIVE ?=3D "/"
=C2=A0BUILDCHROOT_DIR =3D "${BUILDCHROOT_TARGET_DIR}"
=C2=A0
@@ -132,7 +132,7 @@ do_wic_image() {
=C2=A0 =C2=A0 =C2=A0buildchroot_do_mounts
=C2=A0 =C2=A0 =C2=A0sudo -s <<'EOSUDO'
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0( flock 9
- =C2=A0 =C2=A0 =C2=A0 =C2=A0for dir in ${BBLAYERS} ${STAGING_DIR} ${IS= ARROOT}/scripts ${ISARROOT}/bitbake; do
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0for dir in ${BBLAYERS} ${STAGING_DIR} ${SC= RIPTSDIR} ${BITBAKEDIR}; do
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p ${BUILDCHROOT_= DIR}/$dir
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if ! mountpoint ${BUILD= CHROOT_DIR}/$dir >/dev/null 2>&1; then
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mount --b= ind --make-private $dir ${BUILDCHROOT_DIR}/$dir
@@ -149,25 +149,26 @@ EOSUDO
=C2=A0
=C2=A0 =C2=A0 =C2=A0sudo -E chroot ${BUILDCHROOT_DIR} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0sh -c ' \
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ISARROOT=3D"$1"
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0WKS_FULL_PATH=3D"$2"
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0STAGING_DIR=3D"$3"
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0MACHINE=3D"$4"
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0WICTMP=3D"$5"
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0IMAGE_FULLNAME=3D"$6"
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0IMAGE_BASENAME=3D"$7"
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0shift 7
-
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0export PATH=3D"$ISARROOT/bitba= ke/bin:$PATH"
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$ISARROOT"/scripts/wic c= reate "$WKS_FULL_PATH" \
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0BITBAKEDIR=3D"$1"
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0SCRIPTSDIR=3D"$2"
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0WKS_FULL_PATH=3D"$3"
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0STAGING_DIR=3D"$4"
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0MACHINE=3D"$5"
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0WICTMP=3D"$6"
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0IMAGE_FULLNAME=3D"$7"
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0IMAGE_BASENAME=3D"$8"
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0shift 8
+
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0export PATH=3D"$BITBAKEDIR/bin= :$PATH"
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$SCRIPTSDIR"/wic create = "$WKS_FULL_PATH" \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--vars "$STAGING_D= IR/$MACHINE/imgdata/" \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-o "/$WICTMP/${IMA= GE_FULLNAME}.wic/" \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--bmap \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-e "$IMAGE_BASENAM= E" $@' \
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0my_script "${ISA= RROOT}" "${WKS_FULL_PATH}" "${STAGING_DIR}" \
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0my_script "${BIT= BAKEDIR}" "${SCRIPTSDIR}" "${WKS_FULL_PATH}" "= ;${STAGING_DIR}" \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"${MACHINE}= " "${WICTMP}" "${IMAGE_FULLNAME}" "${IMAGE_BA= SENAME}" \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${WIC_CREATE_EXT= RA_ARGS}
- =C2=A0 =C2=A0sudo chown -R $(stat -c "%U" ${ISARROOT}) ${IS= ARROOT}/meta ${ISARROOT}/meta-isar ${ISARROOT}/scripts || true
+ =C2=A0 =C2=A0sudo chown -R $(stat -c "%U" ${LAYERDIR_core})= ${LAYERDIR_core} ${LAYERDIR_isar} ${SCRIPTSDIR} || true
=C2=A0 =C2=A0 =C2=A0WIC_DIRECT=3D$(ls -t -1 ${BUILDCHROOT_DIR}/$WICTMP/= ${IMAGE_FULLNAME}.wic/*.direct | head -1)
=C2=A0 =C2=A0 =C2=A0sudo chown -R $(id -u):$(id -g) ${BUILDCHROOT_DIR}/= ${WICTMP}
=C2=A0 =C2=A0 =C2=A0mv -f ${WIC_DIRECT} ${WIC_IMAGE_FILE}
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index adc403b..d15aba9 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -138,8 +138,8 @@ if [ -n "$CROSS_BUILD" ]; then
=C2=A0fi
=C2=A0
=C2=A0if [ -n "$REPRO_BUILD" ]; then
- =C2=A0 =C2=A0ISAR_TESTSUITE_GPG_PUB_KEY_FILE=3D"$ISARROOT/t= estsuite/base-apt/test_pub.key"
- =C2=A0 =C2=A0ISAR_TESTSUITE_GPG_PRIV_KEY_FILE=3D"$ISARROOT/= testsuite/base-apt/test_priv.key"
+ =C2=A0 =C2=A0ISAR_TESTSUITE_GPG_PUB_KEY_FILE=3D"$TESTSUITED= IR/base-apt/test_pub.key"
+ =C2=A0 =C2=A0ISAR_TESTSUITE_GPG_PRIV_KEY_FILE=3D"$TESTSUITE= DIR/base-apt/test_priv.key"
=C2=A0 =C2=A0 =C2=A0export GNUPGHOME=3D$(mktemp -d)
=C2=A0 =C2=A0 =C2=A0gpg --import $ISAR_TESTSUITE_GPG_PUB_KEY_FILE = $ISAR_TESTSUITE_GPG_PRIV_KEY_FILE
=C2=A0
@@ -187,9 +187,11 @@ if [ -z "$FAST_BUILD" ]; then
=C2=A0 =C2=A0 =C2=A0bitbake $BB_ARGS $TARGETS_SET
=C2=A0fi
=C2=A0
-cp -a "${ISARROOT}/meta/classes/dpkg-base.bbclass" &quo= t;${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup"
-echo -e "do_fetch_append() {\n\n}" >> "${ISARROOT= }/meta/classes/dpkg-base.bbclass"
+eval $(bitbake -e | grep "^LAYERDIR_core=3D")
+
+cp -a "${LAYERDIR_core}/classes/dpkg-base.bbclass" &quo= t;${LAYERDIR_core}/classes/dpkg-base.bbclass.ci-backup"
+echo -e "do_fetch_append() {\n\n}" >> "${LAYERDIR= _core}/classes/dpkg-base.bbclass"
=C2=A0
=C2=A0bitbake $BB_ARGS mc:qemuamd64-stretch:isar-image-base
=C2=A0
-mv "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup&quo= t; "${ISARROOT}/meta/classes/dpkg-base.bbclass"
+mv "${LAYERDIR_core}/classes/dpkg-base.bbclass.ci-backup&quo= t; "${LAYERDIR_core}/classes/dpkg-base.bbclass"
diff --git a/scripts/isar-buildenv-internal b/scripts/isar-builden= v-internal
index 72a91ab..fe1e65f 100755
--- a/scripts/isar-buildenv-internal
+++ b/scripts/isar-buildenv-internal
@@ -59,8 +59,11 @@ fi
=C2=A0unset BDIR
=C2=A0
=C2=A0export BUILDDIR
+export BITBAKEDIR=3D"${ISARROOT}/bitbake"
+export SCRIPTSDIR=3D"${ISARROOT}/scripts"
+export TESTSUITEDIR=3D"${ISARROOT}/testsuite"
=C2=A0
-for newpath in "$ISARROOT/bitbake/bin" "$ISARROOT/scrip= ts"; do
+for newpath in "$BITBAKEDIR/bin" "$SCRIPTSDIR"; do
=C2=A0 =C2=A0 =C2=A0# Remove any existences of $newpath from $PATH
=C2=A0 =C2=A0 =C2=A0PATH=3D$(echo $PATH | sed -re "s#(^|:)$newpath= (:|$)#\2#g;s#^:##")
=C2=A0
@@ -74,5 +77,5 @@ export PATH
=C2=A0BBPATH=3D"${BUILDDIR}"
=C2=A0export BBPATH
=C2=A0
-BB_ENV_EXTRAWHITE=3D"BUILDDIR ISARROOT http_proxy https_proxy ftp= _proxy no_proxy GNUPGHOME"
+BB_ENV_EXTRAWHITE=3D"BUILDDIR BITBAKEDIR SCRIPTSDIR TESTSUITEDIR = http_proxy https_proxy ftp_proxy no_proxy GNUPGHOME"
=C2=A0export BB_ENV_EXTRAWHITE
--=20
2.17.1

=C2=A0
------=_Part_1546_1258025027.1590461698000-- ------=_Part_1545_736803039.1590461698000--