From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6449247988281769984 X-Received: by 10.25.28.142 with SMTP id c136mr224100lfc.35.1501761245444; Thu, 03 Aug 2017 04:54:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.8.26 with SMTP id 26ls91105lji.16.gmail; Thu, 03 Aug 2017 04:54:05 -0700 (PDT) X-Received: by 10.46.87.4 with SMTP id l4mr265229ljb.39.1501761245177; Thu, 03 Aug 2017 04:54:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501761245; cv=none; d=google.com; s=arc-20160816; b=vglt/uvoJ9g81aoaXN6xFEzSUFOkZ0BQMoiR0oSORE7oi0hxzPwNQjUa2vpzLUrCHK T3B3Az79KApYiFjDkKPonc+SAQ5JVl84+5/9Y2qKugvnWdXhJNHPxEByO7igY1+vFjvk z3P/EQhgOO1zoR1ksCZB7xE86xmq8nuZt+YXCzuMSaOZaudjDLpQSsx/1YSphCpQRfAj 0gJZME2/Qp7t/6TI/+IJ+vMgVVsGJEfRX94Xzc0kVZZWqx53ZDUMZZEHudJJiQX/UGdb 66RdzMfTYI3p0fs7MgM17FfpCvCxpJdca7vPjho5M9qR8txR47ekbrxVqKJvcS0D9Idx vz4Q== 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=EfMQQW4rcZj5tWkpnXl0kpqCLnw2AqE+aO5GXdDHVmI=; b=ypkPS/xrLrleQNRC2OEBjqEbAC9ZPacu4K5wn3fo6pLo4zGLdjpg3B1rYRmYJD6mQi 8z8ADt6ZLCPJm2tpseyTFCWIJFDXLTep5LErPuIjEJl9lSAXIQPf96zhdcmdU93iS7Yu uYF4IRWXPJqcdhtInMnYT9IqjwZZ/1vToB+AUQJ7os8M0h/08q/ThRtUUWAj9hzKz4Gz zwY+JyPXQad3zlGPXi7TzcxCTFx0i2RRXMEFL7ZNmNk1GYHP3iwr2nlz0Eo4v27ueDi3 wwbas1ybcpvO1FWGeS83h6HVdzxxrqC0IsRJucOj5ao6HNu5Wri/r/GJFKYStk7sZh2x pL1A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id m6si754221wmh.7.2017.08.03.04.54.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Aug 2017 04:54:05 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id v73Bs4tb031620 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 3 Aug 2017 13:54:04 +0200 Received: from md1em3qc.ww002.siemens.net ([139.25.68.40]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v73Bs3Aq032676; Thu, 3 Aug 2017 13:54:03 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Alexander Smirnov , Henning Schild Subject: [PATCH 0-10 of 16 v2 3/8] remove redundant variable THISDIR Date: Thu, 3 Aug 2017 13:55:52 +0200 Message-Id: <2ea1d8c5cd65ae2ad0e2a17876eb3607c5296b1a.1501760818.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: References: In-Reply-To: References: X-TUID: VPFkCBWgD+Rx Signed-off-by: Henning Schild --- meta-isar/recipes-core/images/isar-image-base.bb | 8 ++++---- meta/classes/isar-base.bbclass | 2 -- meta/recipes-devtools/buildchroot/buildchroot.bb | 10 +++++----- 3 files changed, 9 insertions(+), 11 deletions(-) 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 efd4223..d860937 100644 --- a/meta/classes/isar-base.bbclass +++ b/meta/classes/isar-base.bbclass @@ -19,6 +19,4 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -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