From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6787079713742389248 X-Received: by 2002:a1c:4b0f:: with SMTP id y15mr6698628wma.87.1580240138510; Tue, 28 Jan 2020 11:35:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:c3d1:: with SMTP id d17ls9964146wrg.10.gmail; Tue, 28 Jan 2020 11:35:37 -0800 (PST) X-Google-Smtp-Source: APXvYqyoTn7k4RHw37QZqRwp3/U1ul1Yp2BloJIOK3EfN16iy2XOG7UM7UW9ssVg/SBjcZVKLwCp X-Received: by 2002:adf:ebc1:: with SMTP id v1mr31670277wrn.351.1580240137758; Tue, 28 Jan 2020 11:35:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580240137; cv=none; d=google.com; s=arc-20160816; b=ng58olPNBOX1QWN6/8HYsxURkRQRY1TuqptnjTfNldiPC/Fh1acSio6azrhsbvlKYI KFsID7eiIGrPgTsJSRC57oH2o6G+I1oAnq3FqkY26/J2spD1y7IudU9Muwp3+QnrrwZQ HJ41m2FDh8UgwwGonppV1aujKBmqAIIyEuXWaPe+LObju941Rnn33dvUwUMfLthW6j4e TM8Tn1mfEXHZottah2DcY+hwuhDpvK24SSGKxo3cQKQE2qBVWZyuzr95JLu0nLLCa4+b nm6Lbi+Nq1JgNr/Q6JesJ6GXF6t7+ccNfABIMrV6aYwe8vsZkYqaLEbZ1Uxnl2bWYwPR SOrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=gj3jYKMhfg3/xZDSWt2JVW47Hz8Wmrm8ycS11PNFh+U=; b=vJ4POcf1G1sYLJVEabb3dmHbvh+rY79BiliiHykrceKWZVAvxcgM5CiVVTT5lBUIQ+ d0roULHa4FBTkQxxFHx8hAYehzN+pcemX8U+q8VwZ2Phdz+0q5D5F0PCl03FEMJ7tsgy hAyrfYfvg3GGrSZHa8FoUDX/Jd/v2uQnJnszokhoV/LbqYPFrfJuUSXu6GuIQFTP8ZGE FuYqlYkDEoiG3zW7O6etnswKt0KnUtDeJRLEVE+0q6JwpSqj3SCaRsrFETUPVdyaSBiI Yo2AeqzQ07kK5/Scc6qwiWHnjs/mEuc4VN2wV8oB/ggqE9eMELlMuknk7HyxgQP7vigU 6T9g== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=De63f1OC; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::344 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com. [2a00:1450:4864:20::344]) by gmr-mx.google.com with ESMTPS id p29si99512wmi.2.2020.01.28.11.35.37 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Jan 2020 11:35:37 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::344 as permitted sender) client-ip=2a00:1450:4864:20::344; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=De63f1OC; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::344 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wm1-x344.google.com with SMTP id a5so3821587wmb.0 for ; Tue, 28 Jan 2020 11:35:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=gj3jYKMhfg3/xZDSWt2JVW47Hz8Wmrm8ycS11PNFh+U=; b=De63f1OCKcikymAZZR4ur7ddSeqgQwTF3u0l8SXrM8v/v21JOVgo6OBI3LezQt2emy UCcJTYvnxRSXM0B/I9ak63atIbJxHOJmDUY+O5XQHnuKAFs+cFw0Y+BFwreju/AjK8MB M3coQt8qbDEN4dS+lWEsxaqvKBa4/nl4ihAre2B7EKICsdzn5MUuJvcAsROjdVdlGhNR Q51g74a2vSA6Vf1UqYtgv3RguCZMEmAFQQJVCTrys+b/zXkZVr+hdH3mJ9GobSbNak+e zMvrTd0K7fwGkEolnwIDLHKgxGlcxjffZcNfqg4D0y4c3+23DDPeh09oyIL0TVYrAAsZ Kycw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=gj3jYKMhfg3/xZDSWt2JVW47Hz8Wmrm8ycS11PNFh+U=; b=sHnyt/kiuJdmhD2qFIyC8avUrGyC2KOP1RdmzlPmXLaAEVMKVludBuRxZB0aF7QdCu qkkCEp6wFCsYXqEv6Ko5oUVwFAznwncdP3vZZh5rYBNLXNwzmEgXCut1QtdWILpbigA7 cY+oOgZ9P3+IW4cw/UAXlJKcXLRQM6SQvXygjHpVYniLfNpfhxEDJBlfg7oUHATOB+y4 oUKskze+fnCavlsw7MH4nva5Trr8dRvoDJGI9dGtbsoQYeF3IhjyKGDPo8x/q2qTR6is 8gM3JAXhjiLT1sNEhDFmiQQIdcwbIUCRLTO6kXynqp3CVGuK4z5zMqiMtGok1jb6cHd1 Y75w== X-Gm-Message-State: APjAAAWBrZO+SWGjtbjMdjl9RaOOChMHnNVvaCXPJunFVJqoYXyZmUJm +VTatV+lvZoowgA1d39Pbh+wsUA66jg= X-Received: by 2002:a1c:9e89:: with SMTP id h131mr6656760wme.161.1580240137125; Tue, 28 Jan 2020 11:35:37 -0800 (PST) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id z19sm4047696wmi.35.2020.01.28.11.35.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 11:35:36 -0800 (PST) From: Vijai Kumar K X-Google-Original-From: Vijai Kumar K To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, Vijai Kumar K Subject: [PATCH] Introduce SCRIPTSDIR variable Date: Wed, 29 Jan 2020 01:05:20 +0530 Message-Id: <20200128193520.26504-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 X-TUID: RLMTzlTyDKGU 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 mostly used with wic implemetation for the scripts directory. Introduce SCRIPTSDIR to satisfy wic. When ISARROOT equivalent is needed, derive it from SCRIPTSDIR. Signed-off-by: Vijai Kumar K --- isar-init-build-env | 1 + meta/classes/image-sdk-extension.bbclass | 2 +- meta/classes/wic-img.bbclass | 9 +++++---- scripts/ci_build.sh | 12 +++++++----- scripts/isar-buildenv-internal | 5 ++++- 5 files changed, 18 insertions(+), 11 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 7d30e45..e715f56 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; do + for dir in ${BBLAYERS} ${STAGING_DIR} ${SCRIPTSDIR}; do mkdir -p ${BUILDCHROOT_DIR}/$dir if ! mountpoint ${BUILDCHROOT_DIR}/$dir >/dev/null 2>&1; then mount --bind --make-private $dir ${BUILDCHROOT_DIR}/$dir @@ -148,12 +148,13 @@ EOSUDO WICTMP=$(cd ${BUILDCHROOT_DIR}; mktemp -d -p tmp) sudo -E chroot ${BUILDCHROOT_DIR} \ - ${ISARROOT}/scripts/wic create ${WKS_FULL_PATH} \ + ${SCRIPTSDIR}/wic create ${WKS_FULL_PATH} \ --vars "${STAGING_DIR}/${MACHINE}/imgdata/" \ -o /$WICTMP/${IMAGE_FULLNAME}.wic/ \ --bmap \ -e ${IMAGE_BASENAME} ${WIC_CREATE_EXTRA_ARGS} - sudo chown -R $(stat -c "%U" ${ISARROOT}) ${ISARROOT}/meta ${ISARROOT}/meta-isar ${ISARROOT}/scripts || true + ROOTDIR=`dirname ${SCRIPTSDIR}` + sudo chown -R $(stat -c "%U" ${ROOTDIR}) ${ROOTDIR}/meta ${ROOTDIR}/meta-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 7cd5a2f..727b4a9 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -133,13 +133,15 @@ if [ ! -d "$BUILD_DIR" ]; then fi source isar-init-build-env "$BUILD_DIR" +ROOTDIR=`dirname ${SCRIPTSDIR}` + if [ -n "$CROSS_BUILD" ]; then sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf 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="$ROOTDIR/testsuite/base-apt/test_pub.key" + ISAR_TESTSUITE_GPG_PRIV_KEY_FILE="$ROOTDIR/testsuite/base-apt/test_priv.key" export GNUPGHOME=$(mktemp -d) gpg --import $ISAR_TESTSUITE_GPG_PUB_KEY_FILE $ISAR_TESTSUITE_GPG_PRIV_KEY_FILE @@ -188,9 +190,9 @@ 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" +cp -a "${ROOTDIR}/meta/classes/dpkg-base.bbclass" "${ROOTDIR}/meta/classes/dpkg-base.bbclass.ci-backup" +echo -e "do_fetch_append() {\n\n}" >> "${ROOTDIR}/meta/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 "${ROOTDIR}/meta/classes/dpkg-base.bbclass.ci-backup" "${ROOTDIR}/meta/classes/dpkg-base.bbclass" diff --git a/scripts/isar-buildenv-internal b/scripts/isar-buildenv-internal index 72a91ab..a91ad7a 100755 --- a/scripts/isar-buildenv-internal +++ b/scripts/isar-buildenv-internal @@ -74,5 +74,8 @@ export PATH BBPATH="${BUILDDIR}" export BBPATH -BB_ENV_EXTRAWHITE="BUILDDIR ISARROOT http_proxy https_proxy ftp_proxy no_proxy GNUPGHOME" +SCRIPTSDIR="${ISARROOT}/scripts" +export SCRIPTSDIR + +BB_ENV_EXTRAWHITE="BUILDDIR SCRIPTSDIR http_proxy https_proxy ftp_proxy no_proxy GNUPGHOME" export BB_ENV_EXTRAWHITE -- 2.17.1