Re: [PATCH 05/16] meta: conf: use bitbake.conf from bitbake and apply local changes

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

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

> 2017-08-01 13:17 GMT+03:00 Henning Schild
> <henning.schild@siemens.com>:
> 
> > force isar to always use a bitbake.conf from its bitbake
> > the diff went into a file that needs to be looked at later
> >
> > Signed-off-by: Henning Schild <henning.schild@siemens.com>
> > ---
> >  meta/conf/bitbake.conf.sample | 68 ------------------------------
> > -------------
> >  meta/conf/isar-bitbake.conf   | 20 +++++++++++++
> >  scripts/isar-setup-builddir   | 33 ++++++++++++++++++---
> >  3 files changed, 49 insertions(+), 72 deletions(-)
> >  delete mode 100644 meta/conf/bitbake.conf.sample
> >  create mode 100644 meta/conf/isar-bitbake.conf
> >
> > diff --git a/meta/conf/bitbake.conf.sample
> > b/meta/conf/bitbake.conf.sample deleted file mode 100644
> > index 9d7c1f4..0000000
> > --- a/meta/conf/bitbake.conf.sample
> > +++ /dev/null
> > @@ -1,68 +0,0 @@
> > -# Copyright (C) 2003  Chris Larson
> > -#
> > -# Permission is hereby granted, free of charge, to any person
> > obtaining a -# copy of this software and associated documentation
> > files (the "Software"),
> > -# to deal in the Software without restriction, including without
> > limitation
> > -# the rights to use, copy, modify, merge, publish, distribute,
> > sublicense, -# and/or sell copies of the Software, and to permit
> > persons to whom the -# Software is furnished to do so, subject to
> > the following conditions: -#
> > -# The above copyright notice and this permission notice shall be
> > included -# in all copies or substantial portions of the Software.
> > -#
> > -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> > EXPRESS OR
> > -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> > MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND
> > NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT
> > HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY,
> > WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING
> > FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -#
> > OTHER DEALINGS IN THE SOFTWARE. -
> > -B = "${S}"
> > -CVSDIR = "${DL_DIR}/cvs"
> > -DEPENDS = ""
> > -DEPLOY_DIR = "${TMPDIR}/deploy"
> > -DEPLOY_DIR_DEB = "${TMPDIR}/deploy/deb/${MACHINE}"
> > -DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
> > -DL_DIR = "${TMPDIR}/downloads"
> > -SSTATE_DIR ?= "${TMPDIR}/sstate-cache"
> > -FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
> > -FILESPATH =
> > "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/
> > ${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" -FILE_DIRNAME =
> > "${@os.path.dirname(bb.data.getVar('FILE', d))}" -GITDIR =
> > "${DL_DIR}/git" -IMAGE_CMD = "_NO_DEFINED_IMAGE_TYPES_"
> > -IMAGE_ROOTFS = "${TMPDIR}/rootfs"
> > -MKTEMPCMD = "mktemp -q ${TMPBASE}"
> > -MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}"
> > -OVERRIDES = "local:${MACHINE}:${TARGET_OS}:${TARGET_ARCH}"
> > -P = "${PN}-${PV}"
> > -PERSISTENT_DIR = "${TMPDIR}/cache"
> > -PF = "${PN}-${PV}-${PR}"
> > -PN =
> > "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0]
> > or 'defaultpkgname'}" -PR =
> > "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2]
> > or 'r0'}" -PROVIDES = ""
> > -PV =
> > "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1]
> > or '1.0'}" -RESUMECOMMAND = ""
> > -RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P
> > ${DL_DIR} ${URI}"
> > -S = "${WORKDIR}/${P}"
> > -SRC_URI = "file://${FILE}"
> > -STAMPS_DIR ?= "${TMPDIR}/stamps"
> > -STAMP = "${TMPDIR}/stamps/${PF}"
> > -SVNDIR = "${DL_DIR}/svn"
> > -T = "${WORKDIR}/temp"
> > -TARGET_ARCH = "${BUILD_ARCH}"
> > -TMPDIR = "${TOPDIR}/tmp"
> > -UPDATECOMMAND = ""
> > -UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update
> > ${CVSCOOPTS}" -UPDATECOMMAND_svn = "/usr/bin/env svn update
> > ${SVNCOOPTS}" -WORKDIR = "${TMPDIR}/work/${PF}"
> > -PERSISTENT_DIR = "${TMPDIR}/cache"
> > -BUILDCHROOT_DIR = "${TOPDIR}/tmp/work/buildchroot/${DISTRO}/rootfs"
> > -CACHE = "${TMPDIR}/cache"
> > -
> > -# Setup our default hash policy
> > -BB_SIGNATURE_HANDLER ?= "noop"
> > -
> > -include conf/local.conf
> > -include conf/machine/${MACHINE}.conf
> > -include conf/distro/${DISTRO}.conf
> > diff --git a/meta/conf/isar-bitbake.conf
> > b/meta/conf/isar-bitbake.conf new file mode 100644
> > index 0000000..d56f3da
> > --- /dev/null
> > +++ b/meta/conf/isar-bitbake.conf
> > @@ -0,0 +1,20 @@
> > +DEPLOY_DIR_DEB = "${TMPDIR}/deploy/deb/${MACHINE}"
> > +SSTATE_DIR ?= "${TMPDIR}/sstate-cache"
> > +MKTEMPCMD = "mktemp -q ${TMPBASE}"
> > +MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}"
> > +RESUMECOMMAND = ""
> > +RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P
> > ${DL_DIR} ${URI}"
> > +STAMPS_DIR ?= "${TMPDIR}/stamps"
> > +UPDATECOMMAND = ""
> > +UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update
> > ${CVSCOOPTS}" +UPDATECOMMAND_svn = "/usr/bin/env svn update
> > ${SVNCOOPTS}" +BUILDCHROOT_DIR =
> > "${TOPDIR}/tmp/work/buildchroot/${DISTRO}/rootfs"
> > +CROSSBUILDCHROOT_DIR =
> > "${TOPDIR}/tmp/work/crossbuildchroot/${DISTRO_
> > ARCH}/${DISTRO}/rootfs" 
> 
> This line is something new, should be intorduced in separate patch.

Thanks, that slipped in because the patches where developed on another
branch ... Will remove it.

> 
> > +CACHE = "${TMPDIR}/cache"
> > +
> > +# Setup our default hash policy
> > +BB_SIGNATURE_HANDLER ?= "noop"
> > +
> > +include conf/local.conf
> > +include conf/machine/${MACHINE}.conf
> > +include conf/distro/${DISTRO}.conf
> > diff --git a/scripts/isar-setup-builddir
> > b/scripts/isar-setup-builddir index 070a316..d400694 100755
> > --- a/scripts/isar-setup-builddir
> > +++ b/scripts/isar-setup-builddir
> > @@ -106,10 +106,35 @@ EOM
> >      SHOWYPDOC=yes
> >  fi
> >
> > -if [ ! -f "$BUILDDIR/conf/bitbake.conf" ]; then
> > -    cp "$ISARROOT/meta/conf/bitbake.conf.sample" \
> > -       "$BUILDDIR/conf/bitbake.conf"
> > -fi
> > +cat <<EOF > $BUILDDIR/conf/bitbake.conf
> > +# ********************************************
> > +# THIS FILE IS GENERATED! DO NOT MESS WITH IT!
> > +# ********************************************
> > +
> > +# ---------
> > +# begin original bitbake.conf
> > +# ---------
> > +
> > +EOF
> > +cat "$ISARROOT/bitbake/conf/bitbake.conf" >> \
> > +  "$BUILDDIR/conf/bitbake.conf"
> > +cat <<EOF >> $BUILDDIR/conf/bitbake.conf
> > +# ---------
> > +# end original bitbake.conf
> > +# ---------
> > +
> > +# ---------
> > +# begin isar-bitbake.conf
> > +# ---------
> > +
> > +EOF
> > +cat "$ISARROOT/meta/conf/isar-bitbake.conf" >> \
> > +  "$BUILDDIR/conf/bitbake.conf"
> > +cat <<EOF >> $BUILDDIR/conf/bitbake.conf
> > +# ---------
> > +# end isar-bitbake.conf
> > +# ---------
> > +EOF
> >
> >  # Ending the first-time run message. Show the no documentation
> > banner. if [ ! -z "$SHOWYPDOC" ]; then
> > --
> > 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/87b84dd21dce51befba81e7c2214fd62d7817899.1501582237.git.
> > henning.schild%40siemens.com. For more options, visit
> > https://groups.google.com/d/optout.