From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6628476013057671168 X-Received: by 2002:adf:f88c:: with SMTP id u12mr700580wrp.18.1544434288093; Mon, 10 Dec 2018 01:31:28 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:da4d:: with SMTP id r74ls1525483wmg.2.gmail; Mon, 10 Dec 2018 01:31:27 -0800 (PST) X-Google-Smtp-Source: AFSGD/V8bru6inbwEfWXHvG1h3w8/qpec0W2eD2XaIsqWunw6Y2Uhz5T5m+ypVpqGmgAR7dlMycL X-Received: by 2002:a1c:9089:: with SMTP id s131mr1223008wmd.7.1544434287659; Mon, 10 Dec 2018 01:31:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544434287; cv=none; d=google.com; s=arc-20160816; b=chAiA6ojhB7hYOBNQlN5fmsUxnmd1/FLI0jWMGdzxKPPLkC5Y+a90YGp5fBfWECe4m 2vVLTdTZZQkErDZOo7QxvvQ9u33Rf4v5QjXQTkOOgXDAlwPpTztAY0WCthRuxawPVb1B Q9eElWBsbj2NTlI9prftKNonFLTezr0PAV5F7V/oNjxrqaMHzVewGQY+xr7oKy0IRXWd 6mfh9wdY1H9khAXM9goXndxaVU6hOkG8V0JvYJXcttk93mZolIAjwrl+j6Zc3sgL/pZ5 YlQi0lR3B4yVkliRZdQeu6ATAPEVQPyekFX0YRM7VJH8ZP9foXQH9xrLvbdMmV37HqjB t3SA== 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=ds8DO3tDDyK4xId7cltHMO5DAWJe671eUci1mdHhDgo=; b=YTDFG2j20lJrUzJj2NcBaA/x/T8+wlKmTN5aMu7zQ5bSP6+Eqt3wHIPuHkpKfrujNQ GqfULGbaY5EBHAWjvJgk09zSqOk7/k3tv6HJUcyN12vBgrbWXJrie+iy+0h4DTtxpJIM NtLs/FzwkoPhT6pt/AGf7PMsKfWZrdG2zWfw7RXI59Ux4/+8dExcnYYID8ntYqNcjTLF gkyTeLhgfKfO8I/4sW2zzZgTj6AR6zOZkcaA5EkKNtJqdbwMLejkCKsrXy8WkfOhEE7d h9SXcBoDD5yC/YGm+bt83kE9hdEIXKHCHw3gCNhIn+3k/Lx5BQimQcAEgBptC+tJ0C+K B8ig== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id x13si318937wrn.3.2018.12.10.01.31.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Dec 2018 01:31:27 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id wBA9VQpJ025967 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 Dec 2018 10:31:26 +0100 Received: from [139.25.69.181] (linux-ses-ext02.ppmd.siemens.net [139.25.69.181]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wBA9VQdl029404; Mon, 10 Dec 2018 10:31:26 +0100 Subject: Re: [PATCH 1/2] meta: Only use isar's own bitbake.conf To: "[ext] Jan Kiszka" , Harald Seiler , isar-users@googlegroups.com References: <840a2535ca72f3ff2c900b2ce111fa9f60c1ee84.camel@denx.de> <52645029dc303ad73d45b7bd6fd52530b52d43ae.camel@denx.de> From: Claudius Heine Message-ID: <4cec2b2b-a568-baf8-a152-c7acf3697812@siemens.com> Date: Mon, 10 Dec 2018 10:31:26 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: jmDhtxo7CctR 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. Cheers, Claudius -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de