From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6450015460633083904 X-Received: by 10.129.85.144 with SMTP id j138mr1100936ywb.28.1502134638441; Mon, 07 Aug 2017 12:37:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.107.18.141 with SMTP id 13ls1489272ios.7.gmail; Mon, 07 Aug 2017 12:37:18 -0700 (PDT) X-Received: by 10.99.96.8 with SMTP id u8mr1047388pgb.226.1502134638142; Mon, 07 Aug 2017 12:37:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502134638; cv=none; d=google.com; s=arc-20160816; b=EoJbmtHZx89H6Pm8fyAmVMO8RvP5Ve+ZROVzAGRVIZbD8CNclMJL+tmgcpiTbYdpzX ZWWcHdATJvmKKZNZNbnM5Ij86HUTKHCPmjHm3oUprcXyMllEQ7KH7GVjSj1TbeAXu8Xp Hm1SdAuaD7lT51glyB4b3kdyh3ouJAClHVO8eatV7I6y5SyfWoJM9H+qW0aS1Wl/Ui/H qIZMbp87tl/rkYItwh9lfCULxxS5C9c0Llw2nsb/17CeQj3atVxSgjdXjOuZFDa6y+lH 3D373PfcOd14MJcRUL9QGc3rP4ZkN9JTFLATtbNV7XbKfD0rEMifC5ktFYe/tZTsQ40p L0hw== 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=pNPzhzfiU/TbpgpwcBOukYZZRO6ifIEYT8G/Bv9Bvkg=; b=b5J3mgQA4WkvUI3H+kSnWtES0XUWW2mm0yrjPP1Xh0zImQaocPIeHvoQJn7WdtZI1e xGpT07Zi+2W7198rKzXdASKVW4CUu7C2WeZZyILovUvXyqiBvfP2lV8vT2omTX/+M+Rw vWnFX0TKuUuy7ppOL3LR/YENQt2O+I/x3cY0AxHWFpV+tnZUPbD+E7cJLWU4bKr9ibI0 4zbrRVyE6m4u/TI+92MZKO9HdAJcY02eMLizPqTjN1Zqj1bixG4nZN+Cf6f8ZmRR3byi giP3ff7n5kWm01sxiuiWC2xBcuog2v0MFzODu3L6TPFg9eFkfBLWXt4iu6NbsRVRsNwQ elBw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.b=ZoZWk/sT; spf=pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 2607:f8b0:400d:c09::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-qk0-x243.google.com (mail-qk0-x243.google.com. [2607:f8b0:400d:c09::243]) by gmr-mx.google.com with ESMTPS id w17si594626yww.7.2017.08.07.12.37.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 12:37:18 -0700 (PDT) Received-SPF: pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 2607:f8b0:400d:c09::243 as permitted sender) client-ip=2607:f8b0:400d:c09::243; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.b=ZoZWk/sT; spf=pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 2607:f8b0:400d:c09::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-qk0-x243.google.com with SMTP id m84so1398302qki.5 for ; Mon, 07 Aug 2017 12:37:18 -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=pNPzhzfiU/TbpgpwcBOukYZZRO6ifIEYT8G/Bv9Bvkg=; b=ZoZWk/sTGiV4GO0VSmtavOEzvAUkav136E3LKnUZ1tg7nHegRmLdNp5GfWMKXPJFhN 3xWNvFmhNYl6Wkn0B6/oLqDNi8ZPIB8dD2dcqR26ZAwpjxI+8fCeHUPvUPiVN8aK6paB H85vbGrJJV1YxE3X0vrx0icO8OyezsoYJ+K7O4/oDW/SuQkvwe6ji7OmP2Dr8R27ziWp ZfDy8gT+srgxxLMK4Mxs22zfWGB+gyPi2IAyAXCHnmLXw4UoRH5dz4XDpdaNeom5nCQL SDZaVUpHqv+xDGkCKGTcENcMOAB9iEW1dkBVk7nxy9lEU+9vjwsyEj/H0wK4QQv21NRr +ciA== 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=pNPzhzfiU/TbpgpwcBOukYZZRO6ifIEYT8G/Bv9Bvkg=; b=R7RnAOlQ0nnWx2KI9HZ49rM7ZT8yqdQMwfChAN3AfHZeDFKy3Ivh094eHuXjLq4771 o7H75oav7DZhHXWrO/Vx2o5HOo+ICL/eoltNvtppkPT/JDmY5+mtUg8UX5C0J17uGDfa 8FJZqDgcZ51Tf1EeJNKRvC6dOmmSUE6nj0wnoTTJR/GQYQAr7A2N4GfOFlLlXHRtdcat doTV6qmyzHvJPwCazePYUHwWHlHFKnrbx5K2pz8F6vsGoB9RT+5x81PhOK9pH+Efso/H DGMQ1egThS6Bg4OEXxINZiRKpov9m+g0kxx2W5J6IPYzuWPaebqsEq29eEEAq5VexWO/ 4PuA== X-Gm-Message-State: AHYfb5giO/jy9Bv5g9TH9WYDG4KtnPzPOVO6xRMrQX0RqMGLGEgyqAxd 7yGn/e412aP45NK30Z/UeQv1w447PA== X-Received: by 10.55.168.140 with SMTP id r134mr2349953qke.204.1502134637842; Mon, 07 Aug 2017 12:37:17 -0700 (PDT) MIME-Version: 1.0 Received: by 10.12.148.188 with HTTP; Mon, 7 Aug 2017 12:37:17 -0700 (PDT) In-Reply-To: References: From: Alexander Smirnov Date: Mon, 7 Aug 2017 22:37:17 +0300 Message-ID: Subject: Re: [PATCH 0-10 of 16 v2 4/8] meta: conf: use bitbake.conf from bitbake and apply local changes To: Henning Schild Cc: isar-users@googlegroups.com Content-Type: multipart/alternative; boundary="001a114fce347e564a05562ef9c5" X-TUID: umEwGTBAADsS --001a114fce347e564a05562ef9c5 Content-Type: text/plain; charset="UTF-8" 2017-08-03 14:55 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 > --- > .../{bitbake.conf.sample => isar-bitbake.conf} | 32 > ++------------------- > scripts/isar-setup-builddir | 33 > +++++++++++++++++++--- > 2 files changed, 31 insertions(+), 34 deletions(-) > rename meta/conf/{bitbake.conf.sample => isar-bitbake.conf} (59%) > > diff --git a/meta/conf/bitbake.conf.sample b/meta/conf/isar-bitbake.conf > similarity index 59% > rename from meta/conf/bitbake.conf.sample > rename to meta/conf/isar-bitbake.conf > index 9d7c1f4..7469ea7 100644 > --- a/meta/conf/bitbake.conf.sample > +++ b/meta/conf/isar-bitbake.conf > @@ -1,4 +1,4 @@ > -# Copyright (C) 2003 Chris Larson > +# Copyright (C) 2017 Siemens AG > # > # Permission is hereby granted, free of charge, to any person obtaining a > # copy of this software and associated documentation files (the > "Software"), > @@ -18,45 +18,17 @@ > # 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" > > 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 > > Merged to asmirnov/next --001a114fce347e564a05562ef9c5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

= 2017-08-03 14:55 GMT+03:00 Henning Schild <henning.schild@siemens= .com>:
f= orce 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>
---
=C2=A0.../{bitbake.conf.sample =3D> isar-bitbake.conf}=C2=A0 =C2=A0 =C2= =A0| 32 ++-------------------
=C2=A0scripts/isar-setup-builddir=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 33 +++++++++++++++++++---
=C2=A02 files changed, 31 insertions(+), 34 deletions(-)
=C2=A0rename meta/conf/{bitbake.conf.sample =3D> isar-bitbake.conf} (59%= )

diff --git a/meta/conf/bitbake.conf.sample b/meta/conf/isar-bitbake.co= nf
similarity index 59%
rename from meta/conf/bitbake.conf.sample
rename to meta/conf/isar-bitbake.conf
index 9d7c1f4..7469ea7 100644
--- a/meta/conf/bitbake.conf.sample
+++ b/meta/conf/isar-bitbake.conf
@@ -1,4 +1,4 @@
-# Copyright (C) 2003=C2=A0 Chris Larson
+# Copyright (C) 2017=C2=A0 Siemens AG
=C2=A0#
=C2=A0# Permission is hereby granted, free of charge, to any person obtaini= ng a
=C2=A0# copy of this software and associated documentation files (the "= ;Software"),
@@ -18,45 +18,17 @@
=C2=A0# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE = OR
=C2=A0# OTHER DEALINGS IN THE SOFTWARE.

-B =3D "${S}"
-CVSDIR =3D "${DL_DIR}/cvs"
-DEPENDS =3D ""
-DEPLOY_DIR =3D "${TMPDIR}/deploy"
+
=C2=A0DEPLOY_DIR_DEB =3D "${TMPDIR}/deploy/deb/${MACHINE}" -DEPLOY_DIR_IMAGE =3D "${DEPLOY_DIR}/images"
-DL_DIR =3D "${TMPDIR}/downloads"
=C2=A0SSTATE_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"
=C2=A0MKTEMPCMD =3D "mktemp -q ${TMPBASE}"
=C2=A0MKTEMPDIRCMD =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'}"
=C2=A0RESUMECOMMAND =3D ""
=C2=A0RESUMECOMMAND_wget =3D "/usr/bin/env wget -c -t 5 --passive-ftp = -P ${DL_DIR} ${URI}"
-S =3D "${WORKDIR}/${P}"
-SRC_URI =3D "file://${FILE}"
=C2=A0STAMPS_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"
=C2=A0UPDATECOMMAND =3D ""
=C2=A0UPDATECOMMAND_cvs =3D "/usr/bin/env cvs -d${CVSROOT} update ${CV= SCOOPTS}"
=C2=A0UPDATECOMMAND_svn =3D "/usr/bin/env svn update ${SVNCOOPTS}"= ;
-WORKDIR =3D "${TMPDIR}/work/${PF}"
-PERSISTENT_DIR =3D "${TMPDIR}/cache"
=C2=A0BUILDCHROOT_DIR =3D "${TOPDIR}/tmp/work/buildchroot/${DISTR= O}/rootfs"
=C2=A0CACHE =3D "${TMPDIR}/cache"

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

=C2=A0
Merged to asmirnov/ne= xt
--001a114fce347e564a05562ef9c5--