From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6628476013057671168 X-Received: by 2002:a50:90f5:: with SMTP id d50mr506283eda.9.1544193025204; Fri, 07 Dec 2018 06:30:25 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:994d:: with SMTP id l13ls606019edb.1.gmail; Fri, 07 Dec 2018 06:30:24 -0800 (PST) X-Google-Smtp-Source: AFSGD/XXynClev2qyDP8ZzEutFGfUPdNchN1/V9XqmO1PeqK6c6/QxvYhbYg4uv12awGzIiHszLO X-Received: by 2002:a50:8eca:: with SMTP id x10mr514121edx.8.1544193024757; Fri, 07 Dec 2018 06:30:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544193024; cv=none; d=google.com; s=arc-20160816; b=dFx53mnXINYR/LEj6l9jGjPyLSjmjYobv+SKKMPMKCh06RkdZ9jQHqQit2JHYo3J7S +1S/+f2kHiwsVSZeBw/KxyM4YgOvUdcffng7pr4CzYutZDQGBpnuhiQ5/e5HbYYS71MD yK/QdFTfhAw2eZhwUNQbPo5urTSN8wnQZA4FJyNljytL3L591HX8Y2g0gzcu+WGFJyDb 9G3gJmjNqx4xydViD+cBNexqcFnc0RAhbJeYnEEnh33eAtYDJID/FJPsKvv5ypRT/Co1 HtNLk/jsDeaLVPC6ThSOY52n/bSzKlES5VXQbWThECx6C6m8MkPJWnccSDnjgESKyDVf xoVg== 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=enkT4/TJEdCdFVJJdu3VFU8qor+usvJMEUoI3bhRRAM=; b=SghhJGhpOg7j4AhSSYSbTibWw3Ib/qu1DBLWMvcPifPDeZ36K1QTtPDxTFgebpmwYL FZiIiuGPuTmnqeyi+JAL6nbyT2BY1hB9ay3yrAuN8IEIuoeT+7Tx4gHRghxrzl0KnUjV SL5lPifc4IcFhLBgC30HPZ7b2cpxu9+RcJoDFWEDCktg0priI6hlZOJ+jFe2kCT0S96j MEf95pbuUKB2tgi7EYdQW68H+vdPMd8lnG9Jszp/9dhjdAIAuFmQBO1O9fV5+fpSWTlP SdPikTZTS0TAZk4D3JK0oq/kysEefibRbX3F5h+OTMOS8DBEky+p5wYHugGGo4ImnmiH p/eA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id h28si161539edh.4.2018.12.07.06.30.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Dec 2018 06:30:24 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id wB7EUN6t032002 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 7 Dec 2018 15:30:23 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wB7EUL6T020684; Fri, 7 Dec 2018 15:30:21 +0100 Subject: Re: [PATCH 1/2] meta: Only use isar's own bitbake.conf To: Harald Seiler , isar-users@googlegroups.com References: <840a2535ca72f3ff2c900b2ce111fa9f60c1ee84.camel@denx.de> <52645029dc303ad73d45b7bd6fd52530b52d43ae.camel@denx.de> From: Jan Kiszka Message-ID: Date: Fri, 7 Dec 2018 15:30:20 +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: <52645029dc303ad73d45b7bd6fd52530b52d43ae.camel@denx.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: TlJ4JOKCpC9m 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. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux