From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6628476013057671168 X-Received: by 2002:a50:a5f1:: with SMTP id b46mr2035563edc.12.1544437409484; Mon, 10 Dec 2018 02:23:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:a5f8:: with SMTP id b53ls2507732edc.5.gmail; Mon, 10 Dec 2018 02:23:29 -0800 (PST) X-Google-Smtp-Source: AFSGD/U+wssFucMltaDSyUcK2CgAYwC+OcAb/6dObPfe/h8uSusHP/pQkInxbk/oQoOFa7rQfgqu X-Received: by 2002:aa7:c393:: with SMTP id k19mr391070edq.6.1544437409110; Mon, 10 Dec 2018 02:23:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544437409; cv=none; d=google.com; s=arc-20160816; b=e64U3YRCjnnw7vhzRmEUr8d/dNmLiMCMXbxajLx9qwmMiirXVqaY3SAhj9q90gkHFs MLKPVNbahVmavxNIicbTNz2CulECYH+fCkwA6KW2W4ijFvqmX+JtL8E38XX2j2uPadwz rV0D/alsLOl0PyrdshWPfnYXu1G6fBrbY1TkO67V/AzDJtj0OuxjVaAs6oela7ajILiw SRn/FVzEg+sNIIGV+28pxVB4+oaH3s9vTtOxJoTPF9PtyvgTuEoCGKMKfIoXRsktWUQ0 fgezYmL+GwigV3gHOx081dIQz3PIZkxUGKbk1lmyh/5W7+RzmcttPZnoNtdADsS680Ww aXsg== 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 :message-id:date:subject:cc:to:from; bh=h6ApfnUlQKHkHSvQhWDtKaZv1Xix8cA/GD7r6DXR/uE=; b=Xx24v6FCpOU/oo69JCG0fGJy6dcecgBvkU+EJ2TZeb6akgYCrYDEYyVsOC16YaXsBj WabJDF1L2eRxN8A0zPwf5Kby1AEsJM/Eqa1bdCIh0rLVvLsY8ZltpltQF8uf9WKkfJHN GmiErHFZUq6Xzxy/mQjYOuYXGDmq4mWqYe+iEesJRnTnYnCahKg138RExfHobWufqk/y XavNZFrGbrFe6YgcAFcRbxO8u4/Y0Ze2h4/rUjdBCqNGnqmqBKFEIJDgSQ8HlCPZgYa2 Jo1p5mW5tXx2nkC9bb/er5T9sebP+q/1/t8EBzzYhojDWbX3JgmavjWBT1lvzxXVdQnM gxcQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id m24si561521edc.3.2018.12.10.02.23.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Dec 2018 02:23:29 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@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 claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id wBAANRvU015481 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 Dec 2018 11:23:28 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.181]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id wBAANQEM022573; Mon, 10 Dec 2018 11:23:27 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Harald Seiler Subject: [PATCH v2 1/3] meta: Only use isar's own bitbake.conf Date: Mon, 10 Dec 2018 11:22:45 +0100 Message-Id: <20181210102247.27538-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181210102247.27538-1-claudius.heine.ext@siemens.com> References: <840a2535ca72f3ff2c900b2ce111fa9f60c1ee84.camel@denx.de> <20181210102247.27538-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: uqbc8IQODtal 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 -- 2.19.2