From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6449247988281769984 X-Received: by 10.25.195.210 with SMTP id t201mr1718310lff.8.1501582560421; Tue, 01 Aug 2017 03:16:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.89.2 with SMTP id n2ls218900lfb.16.gmail; Tue, 01 Aug 2017 03:16:00 -0700 (PDT) X-Received: by 10.25.56.91 with SMTP id d27mr1835578lfj.7.1501582559985; Tue, 01 Aug 2017 03:15:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501582559; cv=none; d=google.com; s=arc-20160816; b=bcWrMNCf2qqpDddftko9JyFoe5JeRpRT5a6D3mB271Q+ItqUao9WOpF5+HeDQxHi8d PnsyJ/VoES9/sFmpHQF9Lfj6r9yIvLREG09FnGigkg4hFMA2Rn0R/sMDTAmmDMRGoNcV 51xCwhEYppf1uR1NCTw939yN42UyhyjXTV7ueXYpPtC3To4GOmuRpddR7DhzF+C+UEJY mPhxy9pb2mJCkGL65fr1sPCkzj+J2uNv7Ah6LRxXxglTDz5UUvgzYAV8erYcfU37VX+p ldnH6BWLaOldWQh9ITVqFbtUi3P6WuvUPwlNg+l9+ZeuCc+i+SziKPqXCCiCibBg2A5B VUVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=abH4IGMmg4IerJ2H16nUs/lJwjRm1za4SWfhBXt73iY=; b=bzzcQKWvwfS31AcYUSvJMkxCiZs6Bn0ishpeQK2YW2OjYq+qsAmwLUmJQETz39YRIs bfJT0DhzLpACh+GzMLPphmNwzQ80ENH6PGj3rIWmAS257qpYTd6mZMNzthGp3jXI9HLB 453lYaqHTiYXj8E5ILiqIjtnRXPN6U1wIVNZOtNq0klsK/hw6EhD7z92Y4EroxePeh8F lbMyLCxNBQ7sLjcOXoCpq1kxytIDh061y997TsvUskpzSiOnuftBXuq6DrIFJsx+YwRL Vr2HkH9JSJPKeYU3OBPziEouJsBs+3pZEUh5EF8eQ+aVwi2yCI7DfvXSYU9POZ4RmfJF Al7g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id 2si73374wms.6.2017.08.01.03.15.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 03:15:59 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id v71AFxfe026394 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 1 Aug 2017 12:15:59 +0200 Received: from md1em3qc.ww002.siemens.net ([139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id v71AFx5x016179; Tue, 1 Aug 2017 12:15:59 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 04/16] remove redundant variable THISDIR Date: Tue, 1 Aug 2017 12:17:22 +0200 Message-Id: <5ac96edda9115c2d1e7fd7b8c9aec563fbd07c05.1501582237.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: References: In-Reply-To: References: X-TUID: 9VHcspHi3xeA Signed-off-by: Henning Schild --- .../doc/bitbake-user-manual/bitbake-user-manual-execution.xml | 2 +- meta-isar/recipes-core/images/isar-image-base.bb | 8 ++++---- meta/classes/isar-base.bbclass | 2 -- meta/recipes-devtools/buildchroot/buildchroot.bb | 10 +++++----- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml index ec75893..b9aafd1 100644 --- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml @@ -765,7 +765,7 @@ the concept: BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR \ - SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM \ + SSTATE_DIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM \ USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE LICENSE_PATH SDKPKGSUFFIX" diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index 337c329..0810de0 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -27,10 +27,10 @@ do_rootfs() { install -d -m 755 ${WORKDIR}/hooks_multistrap # Copy config file - install -m 644 ${THISDIR}/files/multistrap.conf.in ${WORKDIR}/multistrap.conf - install -m 755 ${THISDIR}/files/${DISTRO_CONFIG_SCRIPT} ${WORKDIR}/configscript.sh - install -m 755 ${THISDIR}/files/setup.sh ${WORKDIR} - install -m 755 ${THISDIR}/files/download_dev-random ${WORKDIR}/hooks_multistrap/ + install -m 644 ${FILESDIR}/multistrap.conf.in ${WORKDIR}/multistrap.conf + install -m 755 ${FILESDIR}/${DISTRO_CONFIG_SCRIPT} ${WORKDIR}/configscript.sh + install -m 755 ${FILESDIR}/setup.sh ${WORKDIR} + install -m 755 ${FILESDIR}/download_dev-random ${WORKDIR}/hooks_multistrap/ # Adjust multistrap config sed -i 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|' ${WORKDIR}/multistrap.conf diff --git a/meta/classes/isar-base.bbclass b/meta/classes/isar-base.bbclass index 25809fa..33b0369 100644 --- a/meta/classes/isar-base.bbclass +++ b/meta/classes/isar-base.bbclass @@ -1,3 +1 @@ -THISDIR = "${@os.path.dirname(d.getVar('FILE', True))}" - do_build[nostamp] = "0" diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb index ba1bc66..f471f5e 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -29,10 +29,10 @@ do_build() { install -d -m 755 ${WORKDIR}/hooks_multistrap # Copy config files - install -m 644 ${THISDIR}/files/multistrap.conf.in ${WORKDIR}/multistrap.conf - install -m 755 ${THISDIR}/files/configscript.sh ${WORKDIR} - install -m 755 ${THISDIR}/files/setup.sh ${WORKDIR} - install -m 755 ${THISDIR}/files/download_dev-random ${WORKDIR}/hooks_multistrap/ + install -m 644 ${FILESDIR}/multistrap.conf.in ${WORKDIR}/multistrap.conf + install -m 755 ${FILESDIR}/configscript.sh ${WORKDIR} + install -m 755 ${FILESDIR}/setup.sh ${WORKDIR} + install -m 755 ${FILESDIR}/download_dev-random ${WORKDIR}/hooks_multistrap/ # Adjust multistrap config sed -i 's|##BUILDCHROOT_PREINSTALL##|${BUILDCHROOT_PREINSTALL}|' ${WORKDIR}/multistrap.conf @@ -51,7 +51,7 @@ do_build() { sudo multistrap -a ${DISTRO_ARCH} -d "${BUILDCHROOT_DIR}" -f "${WORKDIR}/multistrap.conf" || true # Install package builder script - sudo install -m 755 ${THISDIR}/files/build.sh ${BUILDCHROOT_DIR} + sudo install -m 755 ${FILESDIR}/build.sh ${BUILDCHROOT_DIR} # Configure root filesystem sudo chroot ${BUILDCHROOT_DIR} /configscript.sh -- 2.13.0