Re: [PATCH 0-10 of 16 v2 3/8] remove redundant variable THISDIR

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

Am Mon, 7 Aug 2017 22:30:48 +0300
schrieb Alexander Smirnov <alex.bluesman.smirnov@gmail.com>:

> 2017-08-03 14:55 GMT+03:00 Henning Schild
> <henning.schild@siemens.com>:
> 
> > Signed-off-by: Henning Schild <henning.schild@siemens.com>
> > ---
> >  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
> >
> >  
> As I already mentioned, there is a build problem, need further
> investigation about python version.

I do not remember that remark and do not see how it influences the
validity of this patch. Does the patch introduce the build-problem?

Henning