Re: [PATCH 04/16] remove redundant variable THISDIR

[Henning Schild <henning.schild@siemens.com>]

Am Wed, 2 Aug 2017 11:25:14 +0300
schrieb Alexander Smirnov <alex.bluesman.smirnov@gmail.com>:

> 2017-08-01 13:17 GMT+03:00 Henning Schild
> <henning.schild@siemens.com>:
> 
> > Signed-off-by: Henning Schild <henning.schild@siemens.com>
> > ---
> >  .../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: <literallayout class='monospaced'>
> >       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.