From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6450015460633083904 X-Received: by 10.223.131.36 with SMTP id 33mr157273wrd.21.1501761251854; Thu, 03 Aug 2017 04:54:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.41.132 with SMTP id p126ls323998wmp.21.gmail; Thu, 03 Aug 2017 04:54:11 -0700 (PDT) X-Received: by 10.28.8.77 with SMTP id 74mr221394wmi.15.1501761251569; Thu, 03 Aug 2017 04:54:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501761251; cv=none; d=google.com; s=arc-20160816; b=jIpzakZM9741v9PnZFhDOk7bZZQPyqhDAho3tP6JedDEaeKQgTxHOF3R10+SAfjOKg O4UTFDuqN2hzj2Mo27bi4HIn/4SKRPMZBRKgt/r/NdWonIaQ6DEIlmRY+bZKT3IxmGm9 9jQrp26/hrRrXPDmCS5g1l+LejNGr74QQF5Q/d8fjqrHexVMDAS6CCV3oaLr3HQbxBit FffJE/c6O4V4/aRvvybCWNBWpTcMHe8GTM2Dei9U58AKcPZFuXPnd/Yn+ULyXufhyOgC t9SJ38CEnGWwEb0kOCavzpKf7hvi/zswwpnexACxrhcE5kZYc+qRl+D++HhZ8KurP7tD zRXQ== 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=M7hRK1Zla0CGPdju9DPJnRqSVDVPXKydx6dA34wQReo=; b=evjgBEdXHkO9RiuxHTXTKSfS0t4GNRWDLhWgl0Iy5s14vu8gkzuQ/z7BZTzjTLfzS4 3MOHbHXiOtQ6Q15WFYhrcAjQc+oSr8H8jTDKj9mppF7qFaIx7m6vy6GemFNdH0URitBr bifQ3eEmVVaXb6/jWuMxdHkGYG+OF0PU+bgO7N00cHvpcplSmUD9b2hoMv6Mgf1uNDg0 gkOxzKZkiLybk50AzdusHkzhP9OIbA1qMh0hLkWUgw8+aIRGPbqoT20u1Hjos6Rs87wU uS06H+q+mrG+geJiCGVs7cx7RF8vBS0pEt3CN1XZqaV8/q6jxp1tC8R+N61TK8yduVYf kaqw== 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 f3si683777wme.4.2017.08.03.04.54.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Aug 2017 04:54:11 -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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id v73Bs4uU031427 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 3 Aug 2017 13:54:04 +0200 Received: from md1em3qc.ww002.siemens.net ([139.25.68.40]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v73Bs3Ar032676; Thu, 3 Aug 2017 13:54:03 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Alexander Smirnov , Henning Schild Subject: [PATCH 0-10 of 16 v2 4/8] meta: conf: use bitbake.conf from bitbake and apply local changes Date: Thu, 3 Aug 2017 13:55:53 +0200 Message-Id: X-Mailer: git-send-email 2.13.0 In-Reply-To: References: In-Reply-To: References: X-TUID: Tb8gVlFZQTNw 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 --- .../{bitbake.conf.sample => isar-bitbake.conf} | 32 ++------------------- scripts/isar-setup-builddir | 33 +++++++++++++++++++--- 2 files changed, 31 insertions(+), 34 deletions(-) rename meta/conf/{bitbake.conf.sample => isar-bitbake.conf} (59%) diff --git a/meta/conf/bitbake.conf.sample b/meta/conf/isar-bitbake.conf similarity index 59% rename from meta/conf/bitbake.conf.sample rename to meta/conf/isar-bitbake.conf index 9d7c1f4..7469ea7 100644 --- a/meta/conf/bitbake.conf.sample +++ b/meta/conf/isar-bitbake.conf @@ -1,4 +1,4 @@ -# Copyright (C) 2003 Chris Larson +# Copyright (C) 2017 Siemens AG # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -18,45 +18,17 @@ # 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" 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