From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.28.46.67 with SMTP id u64mr1114561wmu.7.1505220715620; Tue, 12 Sep 2017 05:51:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.74.149 with SMTP id n21ls348578wmi.27.gmail; Tue, 12 Sep 2017 05:51:55 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCgvox8CEJ8oTdZjLwuye4xR0+xYkOyBIw7paaYuh58KqIrBKGH9Qki9tVHlYhwdR9eo3F9 X-Received: by 10.28.137.14 with SMTP id l14mr1157475wmd.15.1505220715076; Tue, 12 Sep 2017 05:51:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505220715; cv=none; d=google.com; s=arc-20160816; b=CUDJmwoQ6LicOMoCFfdqBdBGqLQWeLO34XAeKWZXft+ab9Vd97Jh9TTTxWBaNBYAOl l51IvLsJDjQkKwS94h3uuKiAyXh0u/UjtHrcxkHl/de774nqZmnSeZanlZznctNC1TyA Z/gmOVBtgdAQwJHX+StG1LThhnyEqaiFlaTXovJBSydXBF40EmGQInXhsF5ngAG0JzR6 9DCG3Bxwo4/SneWgmF+rK41znJ25FOOr+NQdzbGV7vtAUTsE6M0mXUW3YDMmPaGZ6+yr Me1RCnNpLBqR34N41Kskrn3ODXBdJrkpxIbMF4PAoFozQI/aexhLZZLSu/emBwM+o11Q w2nQ== 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=6TZiXV/u5/hPVGh4haTq02OHqmrwKvgvoyeJu+bi4y0=; b=XDCevXI+oWRWbgTWYbNs39dvYpHHE+Vx7PDXgzh7GyhMUodbF2m50pBP6w+boT3avF I6gjOi8LW2lsGz9/5Fd/44kxuJLopeUw+3kL8hxODzGAI/7QzyXhJah4WJ2lGezybpYa MG8p2q+fDM+NlhFfb+tjgLiK5Pek0/8CNcBZbRaVKOlwO4vP0b5joDhgXbxBqU4dAmDL XaBYnWp4CPVlCe1tOZKZqve2A4BELipNX3s5Ub2eSxWt+GHk/nJjiFFKtaAXPcbUlx7G PhMpRIRgKcffJUNQqdjfXCArVdonhxSFZ/DbNeKiCkLH67zJ/k6QRYu51yATk538SbsG ToMw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id v184si180783wmf.9.2017.09.12.05.51.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 05:51:55 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id v8CCpsjX021092 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Sep 2017 14:51:54 +0200 Received: from md1em3qc ([139.25.68.40]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v8CCpsKA019604; Tue, 12 Sep 2017 14:51:54 +0200 Date: Tue, 12 Sep 2017 14:52:06 +0200 From: Henning Schild To: Alexander Smirnov Cc: Subject: Re: [PATCH v3 2/5] isar: Change build folders tree Message-ID: <20170912145206.47fe2ed2@md1em3qc> In-Reply-To: <20170911192738.1323-3-asmirnov@ilbers.de> References: <20170911192738.1323-1-asmirnov@ilbers.de> <20170911192738.1323-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: jZc08F73x9EV Am Mon, 11 Sep 2017 22:27:35 +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 | 26 > +++++++++++++----------- > meta/conf/isar-bitbake.conf | 3 ++- > meta/recipes-devtools/buildchroot/buildchroot.bb | 26 > +++++++++++++----------- 3 files changed, 30 insertions(+), 25 > 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..9e1b1da 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 = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" > > do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" > > @@ -30,18 +30,20 @@ do_rootfs() { > install -m 755 ${THISDIR}/files/setup.sh ${WORKDIR} > install -m 755 ${THISDIR}/files/download_dev-random > ${WORKDIR}/hooks_multistrap/ > - # Adjust multistrap config > - sed -i 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|' > ${WORKDIR}/multistrap.conf > - sed -i 's|##DISTRO##|${DISTRO}|' ${WORKDIR}/multistrap.conf > - 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 - > - # Multistrap config use relative paths, so ensure that we are in > the right folder > + # Multistrap accepts only relative path in configuration files, > so get it: cd ${TOPDIR} > + WORKDIR_REL=$(python -c "import os.path; print > os.path.relpath('${WORKDIR}')") + > + # Adjust multistrap config > + sed -i -e 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|g' \ > + -e 's|##DISTRO##|${DISTRO}|g' \ > + -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \ > + -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \ > + -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \ > + -e > 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/configscript.sh|g' \ > + -e 's|##SETUP_SCRIPT##|./'"$WORKDIR_REL"'/setup.sh|g' \ > + -e > 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \ > + ${WORKDIR}/multistrap.conf > > # Create root filesystem > sudo multistrap -a ${DISTRO_ARCH} -d "${IMAGE_ROOTFS}" -f > "${WORKDIR}/multistrap.conf" || true diff --git > a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf index > f85f5cc..5a26743 100644 --- a/meta/conf/isar-bitbake.conf > +++ b/meta/conf/isar-bitbake.conf > @@ -18,9 +18,10 @@ > # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE > OR # OTHER DEALINGS IN THE SOFTWARE. > > +WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PF}" > 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..722007d 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 = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" > > do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > > @@ -34,18 +34,20 @@ do_build() { > install -m 755 ${THISDIR}/files/setup.sh ${WORKDIR} > install -m 755 ${THISDIR}/files/download_dev-random > ${WORKDIR}/hooks_multistrap/ > - # Adjust multistrap config > - sed -i 's|##BUILDCHROOT_PREINSTALL##|${BUILDCHROOT_PREINSTALL}|' > ${WORKDIR}/multistrap.conf > - sed -i 's|##DISTRO##|${DISTRO}|' ${WORKDIR}/multistrap.conf > - 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 - > - # Multistrap config use relative paths, so ensure that we are in > the right folder > + # Multistrap accepts only relative path in configuration files, > so get it: cd ${TOPDIR} > + WORKDIR_REL=$(python -c "import os.path; print > os.path.relpath('${WORKDIR}')") + > + # Adjust multistrap config > + sed -i -e 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|g' \ > + -e 's|##DISTRO##|${DISTRO}|g' \ > + -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \ > + -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \ > + -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \ > + -e > 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/configscript.sh|g' \ > + -e 's|##SETUP_SCRIPT##|./'"$WORKDIR_REL"'/setup.sh|g' \ > + -e > 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \ > + ${WORKDIR}/multistrap.conf Arghh ... So easy on the eye and still wrong. Such style changes should be in another patch, but i guess i started it. You remove ##BUILDCHROOT_PREINSTALL## and add ##IMAGE_PREINSTALL##. Henning > # Create root filesystem > sudo multistrap -a ${DISTRO_ARCH} -d "${BUILDCHROOT_DIR}" -f > "${WORKDIR}/multistrap.conf" || true