From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.25.201.15 with SMTP id z15mr271214lff.40.1504886646779; Fri, 08 Sep 2017 09:04:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.54.163 with SMTP id y35ls27694wmh.23.gmail; Fri, 08 Sep 2017 09:04:06 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6/tle53BljXs/vmSceZFUBY9/JP4JYMTOoaFICC4bP4Lras6mN1F9BgjgwJ0fINP6HpY/A X-Received: by 10.223.152.12 with SMTP id v12mr215441wrb.12.1504886646476; Fri, 08 Sep 2017 09:04:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504886646; cv=none; d=google.com; s=arc-20160816; b=BIXtySP1tNOu89FVHhO6qZzmNpIKzZO/CJ53+sLNCIChrskaj7PU8i4nUvqW9MgQ9l 5uXycaPYLYJJx69MgbOWCIUgy/kRpuAEC1v3n0YLomqwtofa21VFtwj99gCAmZhdQZHa PQSzTMysogS1oqgmpvBfQWJLzjAc2GBYxu8DI5TrkZNS6v5sKgG75Ye7EcIfUHM4w0aG 1RTCuX92E9j6O6QlUGHrk2cr1Flsue5RE0s/k1JtR3qoZ7HBONo9XjhPso2rOxmVMZYI KzunGwwFvdFjC5juIJQDvbNXj4rjpAmn/VSCrO0bvmZPfiItU3c/oq9EKRy5ptTZkw46 iYJA== 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:subject:cc:to:from:date:arc-authentication-results; bh=SfW0eSfCEZNLU4mLvGPlTGA6WQHA4y3kbC5r6j88/MQ=; b=U6tWEpy8oOikCOfKdgUiLM+MSxsDikHj3QS04HG5salmEPcKxyaNDP0BpzmzLnyAST EOKvi1CyCUbwjBDFumtuXWbCWQpLjRC8wxuWsaO5VWdnWds42CJGjG8NBYgcnxWlOSiw a16TKqNO024fyfQHwwTC75vkl1y+yyFrULM8lLHmiHSEitXPnJcNwAugwb8PeY9O/aPw SFq8EMGm4imljnA/QLG17RPwJqWZ91frErNIdUd6TaTmUZo9FeDgnkH9kFF3XdaQRT5U P5vJj0Uw2XNJyclhpQ/h4ICIDEl0Nt20QA9iM+9Ljv8SUlLwRr/I6C5CnhGOchiufvNm S15g== 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 b196si114727wmd.2.2017.09.08.09.04.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 09:04:06 -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 v88G45fH027562 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 8 Sep 2017 18:04:06 +0200 Received: from md1em3qc ([139.25.68.40]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v88G45IN013774; Fri, 8 Sep 2017 18:04:05 +0200 Date: Fri, 8 Sep 2017 18:04:14 +0200 From: Henning Schild To: Alexander Smirnov Cc: Subject: Re: [PATCH v2 2/5] isar: Change build folders tree Message-ID: <20170908180414.2f069bda@md1em3qc> In-Reply-To: <20170908155606.7654-3-asmirnov@ilbers.de> References: <20170908155606.7654-1-asmirnov@ilbers.de> <20170908155606.7654-3-asmirnov@ilbers.de> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: elZHN2wR8Mku Am Fri, 8 Sep 2017 18:56:03 +0300 schrieb Alexander Smirnov : > Differentiate folders tree, that are generated during build on > the highest possible level. So the overal tree now looks like the > following: > > tmp/work/${DISTRO}-${DISTRO_ARCH}/${PF} > > This approach eliminates lots of subfolders to diffirentiate > buildchroot and image for multiconfig builds. Now each configuration > has private tree. > > Signed-off-by: Alexander Smirnov > --- > meta-isar/recipes-core/images/isar-image-base.bb | 8 ++++---- > meta/conf/isar-bitbake.conf | 5 ++++- > meta/recipes-devtools/buildchroot/buildchroot.bb | 8 ++++---- > 3 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/meta-isar/recipes-core/images/isar-image-base.bb > b/meta-isar/recipes-core/images/isar-image-base.bb index > 94cbc9e..cde506e 100644 --- > a/meta-isar/recipes-core/images/isar-image-base.bb +++ > b/meta-isar/recipes-core/images/isar-image-base.bb @@ -17,7 +17,7 @@ > DEPENDS += "${IMAGE_INSTALL}" IMAGE_PREINSTALL += "apt \ > dbus" > > -WORKDIR = "${TMPDIR}/work/${PN}/${MACHINE}/${DISTRO}" > +WORKDIR_NAME = "${PN}" > > do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" > > @@ -36,9 +36,9 @@ do_rootfs() { > sed -i 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|' > ${WORKDIR}/multistrap.conf sed -i > 's|##DISTRO_SUITE##|${DISTRO_SUITE}|' ${WORKDIR}/multistrap.conf sed > -i 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|' > ${WORKDIR}/multistrap.conf > - sed -i > 's|##CONFIG_SCRIPT##|./tmp/work/${PN}/${MACHINE}/${DISTRO}/configscript.sh|' > ${WORKDIR}/multistrap.conf > - sed -i > 's|##SETUP_SCRIPT##|./tmp/work/${PN}/${MACHINE}/${DISTRO}/setup.sh|' > ${WORKDIR}/multistrap.conf > - sed -i > 's|##DIR_HOOKS##|./tmp/work/${PN}/${MACHINE}/${DISTRO}/hooks_multistrap|' > ${WORKDIR}/multistrap.conf > + sed -i > 's|##CONFIG_SCRIPT##|./${WORKDIR_RELATIVE}/configscript.sh|' > ${WORKDIR}/multistrap.conf > + sed -i 's|##SETUP_SCRIPT##|./${WORKDIR_RELATIVE}/setup.sh|' > ${WORKDIR}/multistrap.conf > + sed -i 's|##DIR_HOOKS##|./${WORKDIR_RELATIVE}/hooks_multistrap|' > ${WORKDIR}/multistrap.conf > # Multistrap config use relative paths, so ensure that we are in > the right folder cd ${TOPDIR} > diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf > index f85f5cc..9f3ab27 100644 > --- a/meta/conf/isar-bitbake.conf > +++ b/meta/conf/isar-bitbake.conf > @@ -18,9 +18,12 @@ > # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE > OR # OTHER DEALINGS IN THE SOFTWARE. > > +WORKDIR_NAME ?= "${PF}" > +WORKDIR_RELATIVE = > "tmp/work/${DISTRO}-${DISTRO_ARCH}/${WORKDIR_NAME}" +WORKDIR = > "${TOPDIR}/${WORKDIR_RELATIVE}" DEPLOY_DIR_DEB = > "${TMPDIR}/deploy/deb/${MACHINE}" SSTATE_DIR ?= > "${TMPDIR}/sstate-cache" -BUILDCHROOT_DIR = > "${TOPDIR}/tmp/work/buildchroot/${DISTRO}-${DISTRO_ARCH}/rootfs" > +BUILDCHROOT_DIR = > "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot/rootfs" # Setup > our default hash policy BB_SIGNATURE_HANDLER ?= "noop" > diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb > b/meta/recipes-devtools/buildchroot/buildchroot.bb index > ccba683..3587aa1 100644 --- > a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ > b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -21,7 +21,7 @@ > BUILDCHROOT_PREINSTALL ?= "gcc \ apt \ > automake" > > -WORKDIR = "${TMPDIR}/work/${PF}/${DISTRO}" > +WORKDIR_NAME = "buildchroot" = ${PN} ? Henning > do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > > @@ -40,9 +40,9 @@ do_build() { > sed -i 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|' > ${WORKDIR}/multistrap.conf sed -i > 's|##DISTRO_SUITE##|${DISTRO_SUITE}|' ${WORKDIR}/multistrap.conf sed > -i 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|' > ${WORKDIR}/multistrap.conf > - sed -i > 's|##CONFIG_SCRIPT##|./tmp/work/${PF}/${DISTRO}/configscript.sh|' > ${WORKDIR}/multistrap.conf > - sed -i 's|##SETUP_SCRIPT##|./tmp/work/${PF}/${DISTRO}/setup.sh|' > ${WORKDIR}/multistrap.conf > - sed -i > 's|##DIR_HOOKS##|./tmp/work/${PF}/${DISTRO}/hooks_multistrap|' > ${WORKDIR}/multistrap.conf > + sed -i > 's|##CONFIG_SCRIPT##|./${WORKDIR_RELATIVE}/configscript.sh|' > ${WORKDIR}/multistrap.conf > + sed -i 's|##SETUP_SCRIPT##|./${WORKDIR_RELATIVE}/setup.sh|' > ${WORKDIR}/multistrap.conf > + sed -i 's|##DIR_HOOKS##|./${WORKDIR_RELATIVE}/hooks_multistrap|' > ${WORKDIR}/multistrap.conf > # Multistrap config use relative paths, so ensure that we are in > the right folder cd ${TOPDIR}