From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6628476013057671168 X-Received: by 2002:a1c:8046:: with SMTP id b67mr1174260wmd.22.1544434356595; Mon, 10 Dec 2018 01:32:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a949:: with SMTP id s70ls1497149wme.4.gmail; Mon, 10 Dec 2018 01:32:36 -0800 (PST) X-Google-Smtp-Source: AFSGD/UBQv5Vo8qFaFTqnwvY+rEG6JIdXh368vj/EiX07HWp3ycXxfDcR1+1pTcGLVc46ycHgqed X-Received: by 2002:a1c:6:: with SMTP id 6-v6mr1211100wma.18.1544434356054; Mon, 10 Dec 2018 01:32:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544434356; cv=none; d=google.com; s=arc-20160816; b=0DWCmXG07g3qGjl3FXSOA46SrvkRGV14U+KEHJHE68x0XEkU+Yv1x5Yh76fV1DiswK rwgotWvYJmPnAGC+s8CftdmbHActwyhmYryKIkwx+25Ev1V6zrqM17wkeCwtMKMM2YIr Pt/bcKaH/r+qKqQv7QARGnl97DvBcodgQWsy3PDpQugfqzROFHQZmOKxm0YQDDUYIMTU zLeUrehyD4/uV7sPM9XrZL0P6to2hpNyWbjTtYIb3YrUTVzzWEQqef0I7KjpDmQCkDDw urYkglBdUsbWsKxLT2wHEyqHsbve8BKDgydraFzo9RpnAnUwFz3VT3LPaZgYiobPC2+q 47PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=aNVzncQRBoqAgY9y9Ji0V8jmB+CqAXdN8YJv4Af2aOs=; b=cA79jA5R4Nb29ok8Ga0Oyyd6/fs7pCtIRqTF7ui9/0mQ/u5zFr7ESAGENnVfOI9JLm 4wbnCXn4dkLaStLhyn0n10GE2wbMGemGkIK79QLSgjURKjlDMMKqsHwnkzSaNl9POF1t nwQBN1Hx9iC5FWh2cfxqhwD2iK2t3dc+SxEWhyuQyRk3Z4TmjKSIQRnVzPkguI+hzOQ1 vTt6joCQ2PkNbf/lVGjhlLrAmEWoT6bodb3J8Kv7VwjSYlqAUPDLbH3dtV4BVTn/Px0D ScwHBraMMF5Yn/m6MsO8OJWfh3AUGrkoDvlnxJRj9phq9jtxB+m0nY0Apxsg0kBDCOd7 4hnQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id p19si423675wmc.0.2018.12.10.01.32.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Dec 2018 01:32:36 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id wBA9WZgQ015118 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 Dec 2018 10:32:35 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id wBA9WZ61014680; Mon, 10 Dec 2018 10:32:35 +0100 Subject: Re: [PATCH 1/2] meta: Only use isar's own bitbake.conf To: Claudius Heine , Harald Seiler , isar-users@googlegroups.com References: <840a2535ca72f3ff2c900b2ce111fa9f60c1ee84.camel@denx.de> <52645029dc303ad73d45b7bd6fd52530b52d43ae.camel@denx.de> <4cec2b2b-a568-baf8-a152-c7acf3697812@siemens.com> From: Jan Kiszka Message-ID: <83c53385-6ca0-06db-d0df-f3768b81d2c7@siemens.com> Date: Mon, 10 Dec 2018 10:32:33 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <4cec2b2b-a568-baf8-a152-c7acf3697812@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: lbe2p7rOkazM On 10.12.18 10:31, Claudius Heine wrote: > Hi Jan, > > On 07/12/2018 15.30, [ext] Jan Kiszka wrote: >> On 27.11.18 10:53, Harald Seiler wrote: >>> Similarly to yocto, this commit makes isar only >>> use its own bitbake.conf.  It also adds necessary >>> variables from bitbake's config so everything still >>> works. >>> >>> Signed-off-by: Harald Seiler >>> --- >>>   meta/conf/isar-bitbake.conf | 28 ++++++++++++++++++++++++++++ >>>   scripts/isar-setup-builddir | 21 --------------------- >>>   2 files changed, 28 insertions(+), 21 deletions(-) >>> >>> diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf >>> index bc52d08..f23bf6e 100644 >>> --- a/meta/conf/isar-bitbake.conf >>> +++ b/meta/conf/isar-bitbake.conf >>> @@ -18,6 +18,34 @@ >>>   # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR >>>   # OTHER DEALINGS IN THE SOFTWARE. >>> +# Variables from bitbake/conf/bitbake.conf >>> +B = "${S}" >>> +CVSDIR = "${DL_DIR}/cvs" >>> +DEPENDS = "" >>> +DEPLOY_DIR = "${TMPDIR}/deploy" >>> +FILESPATH = >>> "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" >>> >>> +FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE', False))}" >>> +GITDIR = "${DL_DIR}/git" >>> +IMAGE_CMD = "_NO_DEFINED_IMAGE_TYPES_" >>> +IMAGE_ROOTFS = "${TMPDIR}/rootfs" >>> +OVERRIDES = "local:${MACHINE}:${TARGET_OS}:${TARGET_ARCH}" >>> +P = "${PN}-${PV}" >>> +PF = "${PN}-${PV}-${PR}" >>> +PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or >>> 'defaultpkgname'}" >>> +PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[2] or >>> 'r0'}" >>> +PROVIDES = "" >>> +PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1] or >>> '1.0'}" >>> +S = "${WORKDIR}/${P}" >>> +SRC_URI = "file://${FILE}" >>> +STAMP = "${TMPDIR}/stamps/${PF}" >>> +SVNDIR = "${DL_DIR}/svn" >>> +T = "${WORKDIR}/temp" >>> +TARGET_ARCH = "${BUILD_ARCH}" >>> +TMPDIR = "${TOPDIR}/tmp" >>> +PERSISTENT_DIR = "${TMPDIR}/cache" >>> +GITPKGV = "${@bb.fetch2.get_srcrev(d, 'gitpkgv_revision')}" >>> + >>> +# isar specific config >>>   WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PF}" >>>   DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap" >>>   DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" >>> diff --git a/scripts/isar-setup-builddir b/scripts/isar-setup-builddir >>> index cabe732..d344148 100755 >>> --- a/scripts/isar-setup-builddir >>> +++ b/scripts/isar-setup-builddir >>> @@ -110,30 +110,9 @@ 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 >>> >> >> This series is still pending, I just realized (while writing "all >> configuration starts with bitbake.conf"). >> >> Looks good, I just think we should simply rename isar-bitbake.conf to >> bitbake.conf and copy that in during setup. > > Why? That is not how it is done in current versions of OE. > > The copying process implemented here is a relic from an older bitbake version, > where it didn't support loading the bitbake.conf from a layer. Ah, you mean, we do not need to copy at all? That would be even better! Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux