From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6449247988281769984 X-Received: by 10.25.229.92 with SMTP id c89mr2480081lfh.11.1501672810246; Wed, 02 Aug 2017 04:20:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.135.138 with SMTP id j132ls715513wmd.13.gmail; Wed, 02 Aug 2017 04:20:09 -0700 (PDT) X-Received: by 10.28.125.142 with SMTP id y136mr320525wmc.3.1501672809951; Wed, 02 Aug 2017 04:20:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501672809; cv=none; d=google.com; s=arc-20160816; b=00eSHizth6POAKWqXg0MGxLUPCF5lJOaHay+mtknKmW1O7yTQdFSZcOh6MuAkg62kT eD6i3UuHLqJimxQHhLxqlw7TVrZL3DzwWs7X/WjsFstPwhY6WTksN71UoiUN/zLSNMSV 9lr7GEKispZ9a111aG/b3kQV/7L+DhUbNmfgHgipcYSr9a4UbTvCgrZbw0gceOoQyz0f 1aA6ZKglQcIwUPeng0QBhYVxE0XEXbDuy8035TI21P0bj3WqR24U6fbcpbmnZ0gynOgU gbr0E9osdvesE8ngzH6Mcggh54gbHwnnLyYi9RH90By0gxZKk/Tuks9dTm44NuS3eFMr j0EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:arc-authentication-results; bh=6/bPcX8jvriJllQQmGYTDWY0BngNbhAfcViH3GE+iMM=; b=YKnT+qEOTgsL9O/06FEYj8ePsOjI7G/0dOCK8Ws+hfRCmEsbwzTIKCISZVaNwNPNF3 sm26nK87ETeNh9sYwqCIgiXphy4PsJcWbOwNTx1/YQJcujqwNZTR4F76L1ED8AQ3GHOs QZ54iRal5BZm0BzehmcDG2HdVJEJHQ0IxpnWhNhEkPvVbuBnnKjwq+Oza6yPjMwgpVW9 RMDx5K/0whOMe16ZpN8zhOW+vZb9FtK8bucXjTrEL2ed//NhCsrIYw6bbHPXV8aMvNVa so1cMcTHaqrOI9HPLOFUSFnUF/ULWRp22kbqJ1hPJYYz4c0eu9551mSAWd+/GHRaT2zy KnPg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id j201si1717863wmd.1.2017.08.02.04.20.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Aug 2017 04:20:09 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id v72BK9ZE015653 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 2 Aug 2017 13:20:09 +0200 Received: from md1em3qc ([139.25.68.40]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id v72BK8st012759; Wed, 2 Aug 2017 13:20:09 +0200 Date: Wed, 2 Aug 2017 13:22:03 +0200 From: Henning Schild To: Alexander Smirnov Cc: Subject: Re: [PATCH 05/16] meta: conf: use bitbake.conf from bitbake and apply local changes Message-ID: <20170802132203.0a731a86@md1em3qc> In-Reply-To: References: <87b84dd21dce51befba81e7c2214fd62d7817899.1501582237.git.henning.schild@siemens.com> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: cQrnqgac5OQe Am Wed, 2 Aug 2017 11:34:03 +0300 schrieb Alexander Smirnov : > 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. 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 < $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.