From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6628476013057671168 X-Received: by 2002:a50:d1d6:: with SMTP id i22mr5630396edg.1.1543312422617; Tue, 27 Nov 2018 01:53:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:5a09:: with SMTP id p9-v6ls4839065ejq.3.gmail; Tue, 27 Nov 2018 01:53:42 -0800 (PST) X-Google-Smtp-Source: AJdET5d1pjTGr9p7WBFMe4IT59a08dCLBNLRXZXPEBZ68gCSe6KMv9Ub9IEHOdpnIIfO+oTTYTaP X-Received: by 2002:a17:906:b7d9:: with SMTP id fy25-v6mr4552305ejb.2.1543312422213; Tue, 27 Nov 2018 01:53:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543312422; cv=none; d=google.com; s=arc-20160816; b=oW2MCsQQ97QoJ843Dup9lFQO5DHsR8YcnaamglnGTObCkKWeuIgo/e3fU9ijj80WI3 Ze22faFciQltXaNmB8X15EWIob38khrChaoEQ7sxE5MHc67GTyg/ec3UhFFQUlCkKAdR kh9IVpybnoJ4YAbi4TZzQCc5K4dRpE2XLk3k//0pX5XA9djUsn7XsjnfXoSem5pbvG34 HDVktwqF4+zypvFjj6243PpTeOe9e94jPBIPd7Lcg56QSXPwQLLdSDsS66XeR13lKkrU 9Ag7+MlZf1gQwFzDXVBB1NSFDNZF1JpfcRK4d+Jbx2Kfo7VLpmxzLAcEhdg+bkaddDEq oZZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id; bh=SZg5LwHEejaIbk1Dh2Lq6SUa4wid/v+Zyzs7OaKlbjw=; b=D3SuHp40kgIpIJ5RXvnH/zmX8EabP9Hq6oPuJDsohtRVxTCdi45ojyKm8iu6Xmg6mz 8w5EUhyjRuhnZgx2lpY5XeAxvDJXodKKA8E70VhKHU18Hszo9ByyDt6ftS8+TFc+N/7Y ssZs/EZ9VqZo56yRyj9ieVxvPhvmBB/WJWt9PIMEK+0Zz/mlEzdSeMaZpcMHV3/Msiwl LeXNOjv62bd06wCnaZAYCsT2hzuWJz7C8n/CJfglnEIwTNcjsftV0xkJr5KfgT8iX3wK DmjWO2yuQwvW66g0XyuX/QQ79tC9wNGDjEBv5cUSMFK/kyLXM6VGnqiVBejaWOu4of/Y qJ+A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 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.9]) by gmr-mx.google.com with ESMTPS id d10-v6si160241ejx.0.2018.11.27.01.53.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Nov 2018 01:53:42 -0800 (PST) Received-SPF: neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of hws@denx.de) client-ip=212.18.0.9; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 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 433zd16W7Fz1r5SG for ; Tue, 27 Nov 2018 10:53:41 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 433zd16Qf8z1qstx for ; Tue, 27 Nov 2018 10:53:41 +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 gJckC8AnzSaM for ; Tue, 27 Nov 2018 10:53:41 +0100 (CET) X-Auth-Info: PH66CxvCXnZlOYWF6eRA6NZwMvTHhKICv/2txHZ6I1A= Received: from sandvich (p5B04C80A.dip0.t-ipconnect.de [91.4.200.10]) (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 for ; Tue, 27 Nov 2018 10:53:40 +0100 (CET) Message-ID: <52645029dc303ad73d45b7bd6fd52530b52d43ae.camel@denx.de> Subject: [PATCH 1/2] meta: Only use isar's own bitbake.conf From: Harald Seiler To: isar-users@googlegroups.com Date: Tue, 27 Nov 2018 10:53:40 +0100 In-Reply-To: <840a2535ca72f3ff2c900b2ce111fa9f60c1ee84.camel@denx.de> References: <840a2535ca72f3ff2c900b2ce111fa9f60c1ee84.camel@denx.de> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.30.2 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUID: fYbUmsQ9VTcG 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