From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6628476013057671168 X-Received: by 2002:a1c:28c4:: with SMTP id o187mr1227915wmo.7.1544437534112; Mon, 10 Dec 2018 02:25:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:eac3:: with SMTP id o3ls1859252wrn.8.gmail; Mon, 10 Dec 2018 02:25:33 -0800 (PST) X-Google-Smtp-Source: AFSGD/WnfnNT6x/kJNSpXy9/rlNivyECkZ8Ptp2j6xgV8IcBXvVPQ6FG2i1qw/R3SDqd3vV2E/m9 X-Received: by 2002:adf:b314:: with SMTP id j20mr756684wrd.4.1544437533687; Mon, 10 Dec 2018 02:25:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544437533; cv=none; d=google.com; s=arc-20160816; b=Oc6fftEvm5McYsWoKINr4mz5LLa2VlMKXwWZeX76J2ocDuPQ+BnuyeTlSy+2Tp+ztv kBWFZuRikj7Ssd3gBsgD6+QZN2G4SgII8jfHsJ90jPzsg2h/OkxFJgOr06SjTKtZy/Kh m2DG/9a2ZVCQksDrRTziKsKBFGrlQHcS5FxHIwG9/TvdjWtEd5M6nmqaRxLpLe6n5b7I pEK2V0bkQCBWjyNB+/ze5zherwoVZkL9EkptVY1OxR71NB8F276sw4bSesB3BX8S5ODi 42OKmqzUzdrwmhe2JQ1WhF19gBQ5HmbdX6qjr6rbSXsU+7Zk++ZgyoCXVruKwCyosCbw +JSw== 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:date :to:from:subject:message-id; bh=/+LCxyZAZN1aTs2cZOX3Cxw47NX0w+5234+BVVTe134=; b=vFTleky7s75IKC/cv5ZVTlezTgULUg3rzOIoIXkYBntdrZBL5J436xRO8bTgyveDmX RxWVLpUmIhg+WTM+zEmUx3R7rLlAhbhmx8sVY5huLabHJI1Wug8yFvBKwtxggBNxnMWP 1uR3B1qfDsh6HzPqJ22acorVC/LKg3Yrv02CiSyOYplMen4CaDLKYR6LUpycSYNe19KO u2PEnLDml0XZEoZzVix3NiaCInsPz8/K1rgzHAzW54KkamwKuhWIi+ZynpZ3HndINsYe nDTV+bFz6678ZCA59UBVzEml7p4yyKVxUQSVLOoNE4tb8lC+ck7QYbfUVAPz+zBm/iPA AQ1A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of hws@denx.de) smtp.mailfrom=hws@denx.de Return-Path: Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.10]) by gmr-mx.google.com with ESMTPS id z207si310093wmc.2.2018.12.10.02.25.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Dec 2018 02:25:33 -0800 (PST) Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of hws@denx.de) client-ip=212.18.0.10; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of hws@denx.de) smtp.mailfrom=hws@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43Czjn3FpQz1qvPX; Mon, 10 Dec 2018 11:25:33 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43Czjn2rxRz1qsZj; Mon, 10 Dec 2018 11:25:33 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id hB9Kqhg98go7; Mon, 10 Dec 2018 11:25:32 +0100 (CET) X-Auth-Info: mH+YwlBEbuzf0tDBPtDVmVA17aVuDilZHJMUl6xBvcw= Received: from elite.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Mon, 10 Dec 2018 11:25:32 +0100 (CET) Message-ID: <1544437532.2538.23.camel@denx.de> Subject: Re: [PATCH v2 1/3] meta: Only use isar's own bitbake.conf From: Harald Seiler To: claudius.heine.ext@siemens.com, isar-users@googlegroups.com Date: Mon, 10 Dec 2018 11:25:32 +0100 In-Reply-To: <20181210102247.27538-2-claudius.heine.ext@siemens.com> References: <840a2535ca72f3ff2c900b2ce111fa9f60c1ee84.camel@denx.de> <20181210102247.27538-1-claudius.heine.ext@siemens.com> <20181210102247.27538-2-claudius.heine.ext@siemens.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.26.6 (3.26.6-1.fc27) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUID: rvs2srUw4PP+ Thank you, Claudius! On Mon, 2018-12-10 at 11:22 +0100, claudius.heine.ext@siemens.com wrote: > From: Harald Seiler > > 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 -- Harald DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-62 Fax: +49-8142-66989-80 Email: hws@denx.de