From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6449247988281769984 X-Received: by 10.101.76.138 with SMTP id m10mr16587316pgt.200.1501662844728; Wed, 02 Aug 2017 01:34:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.36.26.68 with SMTP id 65ls2788649iti.14.canary-gmail; Wed, 02 Aug 2017 01:34:04 -0700 (PDT) X-Received: by 10.13.235.18 with SMTP id u18mr16838056ywe.22.1501662844354; Wed, 02 Aug 2017 01:34:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501662844; cv=none; d=google.com; s=arc-20160816; b=YGbDIGvILCZcZp/NNyhcMDcUzc2TJx3oNgzPaQcQC3B5anXb8QwXenoG0grYbuuxHC 6wMHIgqYu1GzY26aBH+aQ4hT1N7aWLxVSZrBqMWYnJ3P4BXk/fueiWQgpt/hBzaSQA3T ce5PW6eOnzB9BcssR+Gjnek+XPVSbQzdziTscgF3+c6HRXINbDT/gIvZzTH2bqGi5Trs Cf5NJv9p55fjJvA0M9/uc/vPjyLxSaj+7t8i1cNyQ20PufnlrPTj8Pz5mWLovTk6RZgV fmMS6ywvXVYgVNB3gxYa71FnrUQtQOm8zhLoX33cKLgizT4fem8/raZT+08BGdFwpUIp H3AQ== 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=TZI7hffgq1dN5AD6c1c48ATfb8SqvQz/EwjkzG1tAkc=; b=t6TIyCLuFRi1i8RGD9hs6OzGPdwqJLVpO0c2jixNNdwFX+nUzSFwrCfCP0gOxhhXph CV+t7Stb3uMOZEjiWJqBjzTwo7V4SJzxzPXdn5OpTp1l253H8XbqBO0SMDXljKJyHS/I IVIPrV9bIGnSgMEEy3DI1Xi8i91ZHqSRI8ihBVpmhQxeGTOubrNo9NeQ9nDHkE8u9bpn TOfxIlW4sqof25Beq8c4vs0+T6dmctGgrR3I4X9Ty+THx1s3IwH2ELO/HxjaHSjX+sIw 8QKIBFrBuueiFGa8C2wUe0zHCJ3Imq1OJd60i5QLaJUEtg2nZ2PgRsEkAM3ppr3/8UsT WHRw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.b=B5YlY+IF; spf=pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 2607:f8b0:400d:c0d::243 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-x243.google.com (mail-qt0-x243.google.com. [2607:f8b0:400d:c0d::243]) by gmr-mx.google.com with ESMTPS id r67si532927ywg.9.2017.08.02.01.34.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Aug 2017 01:34:04 -0700 (PDT) Received-SPF: pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 2607:f8b0:400d:c0d::243 as permitted sender) client-ip=2607:f8b0:400d:c0d::243; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.b=B5YlY+IF; spf=pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 2607:f8b0:400d:c0d::243 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-x243.google.com with SMTP id t37so3936225qtg.2 for ; Wed, 02 Aug 2017 01:34:04 -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=TZI7hffgq1dN5AD6c1c48ATfb8SqvQz/EwjkzG1tAkc=; b=B5YlY+IFBiwfHnP/dV4Vcs95hI9kjz5sW/espRjV48Avm9+Lf0z06O4AFWDWqUYSD1 8WuDMZsBoORLgp1LqDBOZHfNVl4KP2TPP/tYaCAw9y9YYVexqqh1T+8LfHjdEL4Mix0m 8Zvdn96u37qBVO95Qp54d+fuFYKdKLZ4kj8FqcC6rYWiu0fG5AvBgAMy+sIzjsBgZ+WQ v0vdSZklYHFhByg6albvkH8PF55bqjPj1hnwbXsn4Wj03F69x9LavRCaNXyDbuUoQQAC dG7uPQLx4nO417JOKRrqvxhiyPvXXxoHSaxbpRllPK5vYJD7EDKNEsIxJWEVXcrqQ+I7 fw1g== 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=TZI7hffgq1dN5AD6c1c48ATfb8SqvQz/EwjkzG1tAkc=; b=qSKLD2a6YEIdA5cGzIlB2K4835GPWTb1tnNEFoYnXdw4cISZAa2Bh0x6NV3kPXtUU2 7FjdMAAnp+TxY/ZCBC/u+NNm90Bj45nSoBfv1s7oaJos9tCjifN9lYa9LHL9sjF1SD+b 5K0W46J4RHhEzzLcMnABLJATG8gVWknDltwPnYe6g4/HjadzDNbCjN64KEcg1mBiw/+8 VbGFweKHIWHMqfUcKZHOmEcJ0O1zEdlyMyqY4agWerxvH5cq4RA2rDjNBVUtrODzMzbo PWwVvCy8WC30pJAqg1QS/ao8knrywuaGp9Ud5GQWZhYhU9uosYnFAG1chWJnzzy766NK 549g== X-Gm-Message-State: AIVw1130E3qYNDLkeOnwiP9eTeqxDapYl6hbj1TStHQUn0eb21ODchzK esTW2Xx5mE4Zxb4TFs0+g9nofg7CpQ== X-Received: by 10.200.45.240 with SMTP id q45mr32400139qta.332.1501662844063; Wed, 02 Aug 2017 01:34:04 -0700 (PDT) MIME-Version: 1.0 Received: by 10.12.148.188 with HTTP; Wed, 2 Aug 2017 01:34:03 -0700 (PDT) In-Reply-To: <87b84dd21dce51befba81e7c2214fd62d7817899.1501582237.git.henning.schild@siemens.com> References: <87b84dd21dce51befba81e7c2214fd62d7817899.1501582237.git.henning.schild@siemens.com> From: Alexander Smirnov Date: Wed, 2 Aug 2017 11:34:03 +0300 Message-ID: Subject: Re: [PATCH 05/16] meta: conf: use bitbake.conf from bitbake and apply local changes To: Henning Schild Cc: isar-users@googlegroups.com Content-Type: multipart/alternative; boundary="001a113a81f06494a50555c120c2" X-TUID: vcFYV5raKUvV --001a113a81f06494a50555c120c2 Content-Type: text/plain; charset="UTF-8" 2017-08-01 13:17 GMT+03:00 Henning Schild : > 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 > --- > 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. > +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 < $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 <> $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 <> $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. > --001a113a81f06494a50555c120c2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


2017-08-01 13:17 GMT+03:00 Henning Schild <henning.schild@sie= mens.com>:
force isar to al= ways 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>
---
=C2=A0meta/conf/bitbake.conf.sample | 68 -------------------------------------------
=C2=A0meta/conf/isar-bitbake.conf=C2=A0 =C2=A0| 20 +++++++++++++
=C2=A0scripts/isar-setup-builddir=C2=A0 =C2=A0| 33 ++++++++++++++++++--- =C2=A03 files changed, 49 insertions(+), 72 deletions(-)
=C2=A0delete mode 100644 meta/conf/bitbake.conf.sample
=C2=A0create 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=C2=A0 Chris Larson
-#
-# Permission is hereby granted, free of charge, to any person obtaining a<= br> -# copy of this software and associated documentation files (the "Soft= ware"),
-# to deal in the Software without restriction, including without limitatio= n
-# 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<= br> -# 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<= br> -# 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 =3D "${S}"
-CVSDIR =3D "${DL_DIR}/cvs"
-DEPENDS =3D ""
-DEPLOY_DIR =3D "${TMPDIR}/deploy"
-DEPLOY_DIR_DEB =3D "${TMPDIR}/deploy/deb/${MACHINE}"
-DEPLOY_DIR_IMAGE =3D "${DEPLOY_DIR}/images"
-DL_DIR =3D "${TMPDIR}/downloads"
-SSTATE_DIR ?=3D "${TMPDIR}/sstate-cache"
-FILESDIR =3D "${@bb.which(bb.data.getVar('FILESPATH', d,= 1), '.')}"
-FILESPATH =3D "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE= _DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
-FILE_DIRNAME =3D "${@os.path.dirname(bb.data.getVar('FILE= 9;, d))}"
-GITDIR =3D "${DL_DIR}/git"
-IMAGE_CMD =3D "_NO_DEFINED_IMAGE_TYPES_"
-IMAGE_ROOTFS =3D "${TMPDIR}/rootfs"
-MKTEMPCMD =3D "mktemp -q ${TMPBASE}"
-MKTEMPDIRCMD =3D "mktemp -d -q ${TMPBASE}"
-OVERRIDES =3D "local:${MACHINE}:${TARGET_OS}:${TARGET_ARCH}"= ;
-P =3D "${PN}-${PV}"
-PERSISTENT_DIR =3D "${TMPDIR}/cache"
-PF =3D "${PN}-${PV}-${PR}"
-PN =3D "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('= ;FILE',d),d)[0] or 'defaultpkgname'}"
-PR =3D "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('= ;FILE',d),d)[2] or 'r0'}"
-PROVIDES =3D ""
-PV =3D "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('= ;FILE',d),d)[1] or '1.0'}"
-RESUMECOMMAND =3D ""
-RESUMECOMMAND_wget =3D "/usr/bin/env wget -c -t 5 --passive-ftp -P ${= DL_DIR} ${URI}"
-S =3D "${WORKDIR}/${P}"
-SRC_URI =3D "file://${FILE}"
-STAMPS_DIR ?=3D "${TMPDIR}/stamps"
-STAMP =3D "${TMPDIR}/stamps/${PF}"
-SVNDIR =3D "${DL_DIR}/svn"
-T =3D "${WORKDIR}/temp"
-TARGET_ARCH =3D "${BUILD_ARCH}"
-TMPDIR =3D "${TOPDIR}/tmp"
-UPDATECOMMAND =3D ""
-UPDATECOMMAND_cvs =3D "/usr/bin/env cvs -d${CVSROOT} update ${CVSCOOP= TS}"
-UPDATECOMMAND_svn =3D "/usr/bin/env svn update ${SVNCOOPTS}"
-WORKDIR =3D "${TMPDIR}/work/${PF}"
-PERSISTENT_DIR =3D "${TMPDIR}/cache"
-BUILDCHROOT_DIR =3D "${TOPDIR}/tmp/work/buildchroot/${DISTRO}/ro= otfs"
-CACHE =3D "${TMPDIR}/cache"
-
-# Setup our default hash policy
-BB_SIGNATURE_HANDLER ?=3D "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 =3D "${TMPDIR}/deploy/deb/${MACHINE}"
+SSTATE_DIR ?=3D "${TMPDIR}/sstate-cache"
+MKTEMPCMD =3D "mktemp -q ${TMPBASE}"
+MKTEMPDIRCMD =3D "mktemp -d -q ${TMPBASE}"
+RESUMECOMMAND =3D ""
+RESUMECOMMAND_wget =3D "/usr/bin/env wget -c -t 5 --passive-ftp -P ${= DL_DIR} ${URI}"
+STAMPS_DIR ?=3D "${TMPDIR}/stamps"
+UPDATECOMMAND =3D ""
+UPDATECOMMAND_cvs =3D "/usr/bin/env cvs -d${CVSROOT} update ${CVSCOOP= TS}"
+UPDATECOMMAND_svn =3D "/usr/bin/env svn update ${SVNCOOPTS}"
+BUILDCHROOT_DIR =3D "${TOPDIR}/tmp/work/buildchroot/${DISTRO}/ro= otfs"
+CROSSBUILDCHROOT_DIR =3D "${TOPDIR}/tmp/work/crossbuildchroot/${= DISTRO_ARCH}/${DISTRO}/rootfs"

This line is something new, should be intorduced in separate patch.
=
=C2=A0
+CACHE =3D "${TMPDIR}/cache"
+
+# Setup our default hash policy
+BB_SIGNATURE_HANDLER ?=3D "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
=C2=A0 =C2=A0 =C2=A0SHOWYPDOC=3Dyes
=C2=A0fi

-if [ ! -f "$BUILDDIR/conf/bitbake.conf" ]; then
-=C2=A0 =C2=A0 cp "$ISARROOT/meta/conf/bitbake.conf.sample" = \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0"$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" >> \
+=C2=A0 "$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" >> \
+=C2=A0 "$BUILDDIR/conf/bitbake.conf"
+cat <<EOF >> $BUILDDIR/conf/bitbake.conf
+# ---------
+# end isar-bitbake.conf
+# ---------
+EOF

=C2=A0# Ending the first-time run message. Show the no documentation banner= .
=C2=A0if [ ! -z "$SHOWYPDOC" ]; then
--
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/87b84dd21dce51befba81e7c2= 214fd62d7817899.1501582237.git.henning.schild%40siemens.com.<= br> For more options, visit https://groups.google.com/d/optout.

--001a113a81f06494a50555c120c2--