From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6449247988281769984 X-Received: by 10.107.8.138 with SMTP id h10mr15743765ioi.132.1501662315300; Wed, 02 Aug 2017 01:25:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.36.29.194 with SMTP id 185ls2575916itj.17.gmail; Wed, 02 Aug 2017 01:25:15 -0700 (PDT) X-Received: by 10.107.132.206 with SMTP id o75mr16080573ioi.141.1501662315036; Wed, 02 Aug 2017 01:25:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501662314; cv=none; d=google.com; s=arc-20160816; b=UeW2izlqm5g+JcBilVA2AXhsqTxlatLjVtNJp8FqkS9pbY+r+qGj73xAGjkJN7lkBX Rga/GBAg3DW0vlcAN4gITQad3YsKO1lXjRG6Pc8BfFAzTwIqh93qQ+rMXZeTBOTMqB9Q 9tDep+96B8DYndEH6ivTnQTJwWf50UMtKV1rBfqtDE1mWH7LMHQEeunaHat8dvLz9+29 SbOdLjW2C0FsNd/uGI2UzpLf7q7Ptumon+Qj9lnC6tUEy5t9bKnxLZ3FBVA+ihr0Q8Jg 9pUofIxZapoEtN/mAjkPBouAUHnCHZY5ypLI76QtwMdOhK9A2ysqKnuX7fDKXXHfYXL6 yNsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:dkim-signature:arc-authentication-results; bh=wPmPKAbxxfhEQYyvSZ8K50r9/L/ww6oZAohxo8P+ZNs=; b=jZysUHJcFDzAPGOZ4qgFWWdRFc2lCvIg2yYW2Sg+gndB2EsRbmyiu9xcIf0SYX6H8u gmlHZ+Dv7xgI7NkoMwOXhfeXpJwEy0KeURwg+/lFYHtn8Zf67iJlUlc1W16/UP+9/ejO /+6iGokjKBYZUU/AmHCfS3Cj9XZasXfZn9zYgaQ2sNftUEGPunmgHzQnN4IoSANFni/k CvWXrjv6T4kH0dFpEQ8p2mPDBCg2sGY5yULHVtHBq8FivnrgiCPQb2K5JWeRqip74Erh Hos8+2Xj00dDY4D0RzcOihVAeBjRMoEuIMoJbZJz+AtuJUaaivq3v5zEghie3AHkvTNP NI8g== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.b=n3mazxSn; spf=pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 2607:f8b0:400d:c0d::244 as permitted sender) smtp.mailfrom=alex.bluesman.smirnov@gmail.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-qt0-x244.google.com (mail-qt0-x244.google.com. [2607:f8b0:400d:c0d::244]) by gmr-mx.google.com with ESMTPS id x136si890223ywx.6.2017.08.02.01.25.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Aug 2017 01:25:14 -0700 (PDT) Received-SPF: pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 2607:f8b0:400d:c0d::244 as permitted sender) client-ip=2607:f8b0:400d:c0d::244; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.b=n3mazxSn; spf=pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 2607:f8b0:400d:c0d::244 as permitted sender) smtp.mailfrom=alex.bluesman.smirnov@gmail.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: by mail-qt0-x244.google.com with SMTP id c15so3921416qta.3 for ; Wed, 02 Aug 2017 01:25:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=wPmPKAbxxfhEQYyvSZ8K50r9/L/ww6oZAohxo8P+ZNs=; b=n3mazxSnd/4WEba9lVn9ZuetUCKKWKVBJ1qrDIjBFewCWQbAfrbrpzDdctbCzV00KX H3HtFGKsBIygj4Xnp82OjldBWrqDbOmvMs55Rfj5AcovJszVbgkMcOu4upir7T9sDKRS hnGSJL4xUSspBzEaaRnZHCf/TFtie8N97iQpuP1gXEyLoVAIYjZds1NRyWjtENVaLRcY KTtuU9iUxUZIarfKGJ06/+sHr46Vr05C9IjXTEwymhxHFMpzyQo+33UxiBewT0U62+KU 3LSpD/s30U4+9xOTcJU5Y3IsOXUaXi70wK9B1CB1m+GUJxhvU/1UwbkZwsJ39DlJhDJa AngA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=wPmPKAbxxfhEQYyvSZ8K50r9/L/ww6oZAohxo8P+ZNs=; b=KWiZA8+lOZgDDhselJ6R+lWJRjHh1r+xEIAUcf2jSGRayDiX4ml2TOZX9PGnhsYRlS e9tShXBK22DikLoOI7ubFKIkF2ryXGITM4aEwRMDnrLFUs9R2zX1VLn1E5RIkkJ9uLur XYEXj7m3opknoAudTv/P50/rofy1VuWDfyYyETrucAEHeG+Axi05XbdXDJJwfWLs84b6 XrGYo30m8fZz6cnabnOGcRRxjNGInzHyY2YVNVozQXpVW8xS5kchTeRj1pBNoAK1R74O AqQxalHRqFZKlIeTjD9v3CPvwm51h/6PT4uIWQHfKhJDnIQDEJunkgTdb1iLarZ7YwUq NsVw== X-Gm-Message-State: AIVw110a9Yl6KvFbZtZ5KU7mvCt/mC9H94EG0+rQO7yaZ69lZmIZVO5c TuE04RChOymyfzz3tMCy2WIodSpMOg== X-Received: by 10.237.37.140 with SMTP id x12mr29610582qtc.133.1501662314728; Wed, 02 Aug 2017 01:25:14 -0700 (PDT) MIME-Version: 1.0 Received: by 10.12.148.188 with HTTP; Wed, 2 Aug 2017 01:25:14 -0700 (PDT) In-Reply-To: <5ac96edda9115c2d1e7fd7b8c9aec563fbd07c05.1501582237.git.henning.schild@siemens.com> References: <5ac96edda9115c2d1e7fd7b8c9aec563fbd07c05.1501582237.git.henning.schild@siemens.com> From: Alexander Smirnov Date: Wed, 2 Aug 2017 11:25:14 +0300 Message-ID: Subject: Re: [PATCH 04/16] remove redundant variable THISDIR To: Henning Schild Cc: isar-users@googlegroups.com Content-Type: multipart/alternative; boundary="001a114211e2d7921b0555c1008f" X-TUID: du4boWzJM++7 --001a114211e2d7921b0555c1008f Content-Type: text/plain; charset="UTF-8" 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. > 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. > --001a114211e2d7921b0555c1008f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
2017= -08-01 13:17 GMT+03:00 Henning Schild <henning.schild@siemens.com= >:
Signed-off-by: Henning S= child <henning.schild@siem= ens.com>
---
=C2=A0.../doc/bitbake-user-manual/bitbake-user-manual-execution.x= ml=C2=A0 |=C2=A0 2 +-
=C2=A0meta-isar/recipes-core/images/isar-image-base.bb=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 8 ++++----
=C2=A0meta/classes/isar-base.bbclass=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0|=C2=A0 2 --
=C2=A0meta/recipes-devtools/buildchroot/buildchroot.bb=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 10 +++++-----
=C2=A04 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-executi= on.xml
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-executi= on.xml
@@ -765,7 +765,7 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0the concept:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<literallayout class=3D&= #39;monospaced'>
=C2=A0 =C2=A0 =C2=A0 BB_HASHBASE_WHITELIST ?=3D "TMPDIR FILE PATH PWD = BB_TASKHASH BBPATH DL_DIR \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_= DIRNAME HOME LOGNAME SHELL TERM \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0SSTATE_DIR FILESEXTRAPATHS FILE_DIRNAME = HOME LOGNAME SHELL TERM \

Does this change have any reference in ups= tream? 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.
=C2=A0
isar-image-base.bb b/me= ta-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() {
=C2=A0 =C2=A0 =C2=A0install -d -m 755 ${WORKDIR}/hooks_multistrap

=C2=A0 =C2=A0 =C2=A0# Copy config file
-=C2=A0 =C2=A0 install -m 644 ${THISDIR}/files/multistrap.conf.in = ${WORKDIR}/multistrap.conf
-=C2=A0 =C2=A0 install -m 755 ${THISDIR}/files/${DISTRO_CONFIG_SCRIPT}= ${WORKDIR}/configscript.sh
-=C2=A0 =C2=A0 install -m 755 ${THISDIR}/files/setup.sh ${WORKDIR}
-=C2=A0 =C2=A0 install -m 755 ${THISDIR}/files/download_dev-random ${W= ORKDIR}/hooks_multistrap/
+=C2=A0 =C2=A0 install -m 644 ${FILESDIR}/multistrap.conf.in ${WORKDIR}= /multistrap.conf
+=C2=A0 =C2=A0 install -m 755 ${FILESDIR}/${DISTRO_CONFIG_SCRIPT} ${WO= RKDIR}/configscript.sh
+=C2=A0 =C2=A0 install -m 755 ${FILESDIR}/setup.sh ${WORKDIR}
+=C2=A0 =C2=A0 install -m 755 ${FILESDIR}/download_dev-random ${WORKDI= R}/hooks_multistrap/

=C2=A0 =C2=A0 =C2=A0# Adjust multistrap config
=C2=A0 =C2=A0 =C2=A0sed -i 's|##IMAGE_PREINSTALL##|${IMAGE_PREINST= ALL}|' ${WORKDIR}/multistrap.conf
diff --git a/meta/classes/isar-base.bbclass b/meta/classes/isar-base.<= wbr>bbclass
index 25809fa..33b0369 100644
--- a/meta/classes/isar-base.bbclass
+++ b/meta/classes/isar-base.bbclass
@@ -1,3 +1 @@
-THISDIR =3D "${@os.path.dirname(d.getVar('FILE', True))}= "
-
=C2=A0do_build[nostamp] =3D "0"
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/r= ecipes-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() {
=C2=A0 =C2=A0 =C2=A0install -d -m 755 ${WORKDIR}/hooks_multistrap

=C2=A0 =C2=A0 =C2=A0# Copy config files
-=C2=A0 =C2=A0 install -m 644 ${THISDIR}/files/multistrap.conf.in = ${WORKDIR}/multistrap.conf
-=C2=A0 =C2=A0 install -m 755 ${THISDIR}/files/configscript.sh ${WORKD= IR}
-=C2=A0 =C2=A0 install -m 755 ${THISDIR}/files/setup.sh ${WORKDIR}
-=C2=A0 =C2=A0 install -m 755 ${THISDIR}/files/download_dev-random ${W= ORKDIR}/hooks_multistrap/
+=C2=A0 =C2=A0 install -m 644 ${FILESDIR}/multistrap.conf.in ${WORKDIR}= /multistrap.conf
+=C2=A0 =C2=A0 install -m 755 ${FILESDIR}/configscript.sh ${WORKDIR}
+=C2=A0 =C2=A0 install -m 755 ${FILESDIR}/setup.sh ${WORKDIR}
+=C2=A0 =C2=A0 install -m 755 ${FILESDIR}/download_dev-random ${WORKDI= R}/hooks_multistrap/

=C2=A0 =C2=A0 =C2=A0# Adjust multistrap config
=C2=A0 =C2=A0 =C2=A0sed -i 's|##BUILDCHROOT_PREINSTALL##|${BUILDCH= ROOT_PREINSTALL}|' ${WORKDIR}/multistrap.conf
@@ -51,7 +51,7 @@ do_build() {
=C2=A0 =C2=A0 =C2=A0sudo multistrap -a ${DISTRO_ARCH} -d "${BUILDCHROO= T_DIR}" -f "${WORKDIR}/multistrap.conf" || true

=C2=A0 =C2=A0 =C2=A0# Install package builder script
-=C2=A0 =C2=A0 sudo install -m 755 ${THISDIR}/files/build.sh ${BUILDCHROOT_= DIR}
+=C2=A0 =C2=A0 sudo install -m 755 ${FILESDIR}/build.sh ${BUILDCHROOT_DIR}<= br>
=C2=A0 =C2=A0 =C2=A0# Configure root filesystem
=C2=A0 =C2=A0 =C2=A0sudo chroot ${BUILDCHROOT_DIR} /configscript.sh
--
2.13.0

--
You received this message because you are subscribed to the Google Groups &= quot;isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an e= mail to isar-u= sers+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/5ac96edda9115c2d1e7fd7b8c= 9aec563fbd07c05.1501582237.git.henning.schild%40siemens.com.<= br> For more options, visit https://groups.google.com/d/optout.

--001a114211e2d7921b0555c1008f--