From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6449247988281769984 X-Received: by 10.46.88.26 with SMTP id m26mr702921ljb.32.1501582560394; Tue, 01 Aug 2017 03:16:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.134.141 with SMTP id i135ls200326wmd.10.canary-gmail; Tue, 01 Aug 2017 03:16:00 -0700 (PDT) X-Received: by 10.223.141.210 with SMTP id o76mr1034151wrb.13.1501582560047; Tue, 01 Aug 2017 03:16:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501582560; cv=none; d=google.com; s=arc-20160816; b=GROTBSTGGeAYR8rlEAkh3YoTS5RYPfyHZF5f1ltXzxwBR566gUv1iloqdt2hH8Oeid HA767nu+Zhz2lSdM/nuK8/rSFvno1ArgX39H4rH/Cm/5R7HcL6tFcN4T6Qn/hBlxJSYo uFBRPlOC1yC1dphh1iUvHghuDH6bc1FiUSUNWC5dhpjWsPOKXEFxUzMdMxd2oAsWwoxN J64irVsUihtla+dVWRmSd7yuS8xOaLh4PEXwUh2nleOHQq8VEaaphgb9kXifOxKRokUf xqpa9zRpuY7quEsB9z6+aU8JF7wJRZf24mExVfwK24aRledDbv3ZjJylmjM1+q+EWArK Lw0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Yit7FUu2AYRB0XTBWBVbcyQ/J0UYeyp1yljSl0gk/VU=; b=GzA+9rGGggfoe1U3Bwn9qXGtIIWWOJZ1N/zsYZ3wykUoG+WjZslCrPZlNrHRYu7psW fysAy7xA3YI3LW3QVK0Qph574LO64rysZ3Pa52peiJkOF3oZXksJTUxyssJFk6z2n9oA QY5Gk8+ofVOoG2hYjWtGkuT1lO36u/pMkjcz4NEbIOS+M/SwefXxBvZpSUAfu/TVYR0e FrhwZ3lluKBU9V3VG/95dheEeuyGvY9C73OVksahyYVd/Vr3UbD+6rwFpEGk36BuU15L 8b4nRVa9NEowHtNL0hr2oAv1znyMdKQ3P/O7+g6T5kU+tV1AOmJoRJJvheM7L9EAUQdR 40cw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id t129si79722wmt.2.2017.08.01.03.15.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 03:16:00 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id v71AFxFM010878 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 1 Aug 2017 12:15:59 +0200 Received: from md1em3qc.ww002.siemens.net ([139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id v71AFx60016179; Tue, 1 Aug 2017 12:15:59 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 05/16] meta: conf: use bitbake.conf from bitbake and apply local changes Date: Tue, 1 Aug 2017 12:17:23 +0200 Message-Id: <87b84dd21dce51befba81e7c2214fd62d7817899.1501582237.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: References: In-Reply-To: References: X-TUID: Ovh1sEMDCh4y force isar to always use a bitbake.conf from its bitbake the diff went into a file that needs to be looked at later Signed-off-by: Henning Schild --- meta/conf/bitbake.conf.sample | 68 ------------------------------------------- meta/conf/isar-bitbake.conf | 20 +++++++++++++ scripts/isar-setup-builddir | 33 ++++++++++++++++++--- 3 files changed, 49 insertions(+), 72 deletions(-) delete mode 100644 meta/conf/bitbake.conf.sample create mode 100644 meta/conf/isar-bitbake.conf diff --git a/meta/conf/bitbake.conf.sample b/meta/conf/bitbake.conf.sample deleted file mode 100644 index 9d7c1f4..0000000 --- a/meta/conf/bitbake.conf.sample +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright (C) 2003 Chris Larson -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. - -B = "${S}" -CVSDIR = "${DL_DIR}/cvs" -DEPENDS = "" -DEPLOY_DIR = "${TMPDIR}/deploy" -DEPLOY_DIR_DEB = "${TMPDIR}/deploy/deb/${MACHINE}" -DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" -DL_DIR = "${TMPDIR}/downloads" -SSTATE_DIR ?= "${TMPDIR}/sstate-cache" -FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" -FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" -FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" -GITDIR = "${DL_DIR}/git" -IMAGE_CMD = "_NO_DEFINED_IMAGE_TYPES_" -IMAGE_ROOTFS = "${TMPDIR}/rootfs" -MKTEMPCMD = "mktemp -q ${TMPBASE}" -MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}" -OVERRIDES = "local:${MACHINE}:${TARGET_OS}:${TARGET_ARCH}" -P = "${PN}-${PV}" -PERSISTENT_DIR = "${TMPDIR}/cache" -PF = "${PN}-${PV}-${PR}" -PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" -PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" -PROVIDES = "" -PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" -RESUMECOMMAND = "" -RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}" -S = "${WORKDIR}/${P}" -SRC_URI = "file://${FILE}" -STAMPS_DIR ?= "${TMPDIR}/stamps" -STAMP = "${TMPDIR}/stamps/${PF}" -SVNDIR = "${DL_DIR}/svn" -T = "${WORKDIR}/temp" -TARGET_ARCH = "${BUILD_ARCH}" -TMPDIR = "${TOPDIR}/tmp" -UPDATECOMMAND = "" -UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update ${CVSCOOPTS}" -UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}" -WORKDIR = "${TMPDIR}/work/${PF}" -PERSISTENT_DIR = "${TMPDIR}/cache" -BUILDCHROOT_DIR = "${TOPDIR}/tmp/work/buildchroot/${DISTRO}/rootfs" -CACHE = "${TMPDIR}/cache" - -# Setup our default hash policy -BB_SIGNATURE_HANDLER ?= "noop" - -include conf/local.conf -include conf/machine/${MACHINE}.conf -include conf/distro/${DISTRO}.conf diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf new file mode 100644 index 0000000..d56f3da --- /dev/null +++ b/meta/conf/isar-bitbake.conf @@ -0,0 +1,20 @@ +DEPLOY_DIR_DEB = "${TMPDIR}/deploy/deb/${MACHINE}" +SSTATE_DIR ?= "${TMPDIR}/sstate-cache" +MKTEMPCMD = "mktemp -q ${TMPBASE}" +MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}" +RESUMECOMMAND = "" +RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}" +STAMPS_DIR ?= "${TMPDIR}/stamps" +UPDATECOMMAND = "" +UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update ${CVSCOOPTS}" +UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}" +BUILDCHROOT_DIR = "${TOPDIR}/tmp/work/buildchroot/${DISTRO}/rootfs" +CROSSBUILDCHROOT_DIR = "${TOPDIR}/tmp/work/crossbuildchroot/${DISTRO_ARCH}/${DISTRO}/rootfs" +CACHE = "${TMPDIR}/cache" + +# Setup our default hash policy +BB_SIGNATURE_HANDLER ?= "noop" + +include conf/local.conf +include conf/machine/${MACHINE}.conf +include conf/distro/${DISTRO}.conf diff --git a/scripts/isar-setup-builddir b/scripts/isar-setup-builddir index 070a316..d400694 100755 --- a/scripts/isar-setup-builddir +++ b/scripts/isar-setup-builddir @@ -106,10 +106,35 @@ EOM SHOWYPDOC=yes fi -if [ ! -f "$BUILDDIR/conf/bitbake.conf" ]; then - cp "$ISARROOT/meta/conf/bitbake.conf.sample" \ - "$BUILDDIR/conf/bitbake.conf" -fi +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.13.0