From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6449247988281769984 X-Received: by 10.223.150.248 with SMTP id u111mr1351182wrb.1.1501672739352; Wed, 02 Aug 2017 04:18:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.149.136 with SMTP id x130ls396512lfd.26.gmail; Wed, 02 Aug 2017 04:18:58 -0700 (PDT) X-Received: by 10.46.25.82 with SMTP id p79mr1797278lje.5.1501672738879; Wed, 02 Aug 2017 04:18:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501672738; cv=none; d=google.com; s=arc-20160816; b=TDZiryeedOGug/TAf2mG/5a9NEyO7W7sFDJwucY/uwe1yM8nBxMdeQaplyJ7MLxHL4 v/Co6/vQ13YsZZKmXvzPCVlVwaGMxeHkTZn6MWXIX0iTKI/69PehbS4XZ7gZcUfEODpA PExkVnlGOCiMkQlKUQI5DnqHwuX5Yi5GMJzK3Oaff/yR/sBIp2svymyfKqSXqREpqje+ QL2ytBpNphNC6iTkFOBRHx+ld9NQg+Mr2SrAyzPXeJHFJdLKg0ZkHbBCS+iKPowPnsQR qnQomILvFXzq4Vfk/eHY91mCu8voU4A8bGMpQ3Lwq8a1ZJa/rfMHZTXcoHuB6MILMn4X Ri+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:arc-authentication-results; bh=Pz+/sSVvQk+DMDUMpmazQL10/CVe6PksPcklrI0/ymU=; b=tDomMZmGLRPdlViQViTTuxHn3Lxx2RPO4HqVAc1cLq27cxL+fmdgUok/OAcKw8cAz8 pTknUOGSWgPeY1t4JxwL04DFk24kO3umVGombFpekmoSLzGC/Y1bD0pIvFknm++dQdL7 oa6fyvYfl5MvpZ4e4J2yQz9b0VjEDEMotrNviTp/uSBxfLOQOMsRh1g9tZEM/D5NbglE gLe0xCYP7X+ZEnC6McAXGzW+gctmfVF/c2BaSi971fc8kdOKFybHEMiwueP4QqUpfFfG 8AijA158reli1vYWq1ErA85rX5Bj1Qi+pbZ6Nn1OHqXwt3Pgh7TqlmfwJfrryDr8D3Ae WfCw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id k68si944771wmg.4.2017.08.02.04.18.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Aug 2017 04:18:58 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id v72BIwO8010671 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 2 Aug 2017 13:18:58 +0200 Received: from md1em3qc ([139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id v72BIw7u006525; Wed, 2 Aug 2017 13:18:58 +0200 Date: Wed, 2 Aug 2017 13:20:52 +0200 From: Henning Schild To: Alexander Smirnov Cc: Subject: Re: [PATCH 04/16] remove redundant variable THISDIR Message-ID: <20170802132052.3aa16a74@md1em3qc> In-Reply-To: References: <5ac96edda9115c2d1e7fd7b8c9aec563fbd07c05.1501582237.git.henning.schild@siemens.com> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: NL1fbvhrTlVr Am Wed, 2 Aug 2017 11:25:14 +0300 schrieb Alexander Smirnov : > 2017-08-01 13:17 GMT+03:00 Henning Schild > : > > > 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 \ > > Does this change have any reference in upstream? We are trying to keep > bitbake tree unmodified to simplify migration to newer versions. If > not, probably we can drop this modification and apply the rest of the > patch. Thanks, that was a mistake and will be removed from the patch. Henning > > 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 > > > > -- > > You received this message because you are subscribed to the Google > > Groups "isar-users" group. > > To unsubscribe from this group and stop receiving emails from it, > > send an email to isar-users+unsubscribe@googlegroups.com. > > To post to this group, send email to isar-users@googlegroups.com. > > To view this discussion on the web visit > > https://groups.google.com/d/ > > msgid/isar-users/5ac96edda9115c2d1e7fd7b8c9aec563fbd07c05.1501582237.git. > > henning.schild%40siemens.com. For more options, visit > > https://groups.google.com/d/optout.