From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.25.181.214 with SMTP id g83mr1211718lfk.17.1505221356069; Tue, 12 Sep 2017 06:02:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.100.130 with SMTP id y124ls356512wmb.9.gmail; Tue, 12 Sep 2017 06:02:35 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBni2jT26Qr1SG/HnmPnpsyTS9xGunyDnvTeP6f9Yqdre6faHYGVMYAKq9Y8K/SBpQw15UH X-Received: by 10.28.142.201 with SMTP id q192mr1205194wmd.23.1505221355685; Tue, 12 Sep 2017 06:02:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505221355; cv=none; d=google.com; s=arc-20160816; b=sSye2Kx3E+mlmROPF4m1HRg/p1Ct+8GdY0nQh1X2kpimWV8fzv5znr+loB12x8zKmO 4la7Dh5PaFZB6XwlcXf7U3EeYQyZ7Q/iwva6WjaHiRMhi+U4wKopnOwMRdxCtQZ5nLOs Ss+EVBbRDscqfTiJDEuxFZqeA+x2BTkWP0da2OqMzcxE/LMf4AK7DFZMWMf9gVoCVlf6 E8YW5ZCBEUM66RyvLsXjv03+at8uTUEg+69m+7BNVMBrBCPhF4PM1wKbhY4qBS9r40lv LEx0lfaQwQNsMPToMon7P4KCsG2lJWIprs4pRv7BzkEm3FsGt5nlNhYisMrml0BT5Puf KxFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject :arc-authentication-results; bh=5FyGvBRluhH0y2WELaqHaZY5JnWymnZjFIhzrk7tZUk=; b=yWv+mvmgHpaHhP6YDcT+dWZQ5QfH76ou/832yfvw+0itUoOvYnCQEoQO/+PZLyQlCJ j+VIJJNH+zcplIfkRF18PL6g1yjqX2TqtzjPUIJf+wDkivs2iIqUqNIw9bfpB0+wYv0t dlgBk4RKvOXSFYhT9sCW8rkXE5SL7N98y+Yq8XUZ09Trm1/dWTb0x765Drcvkpntv2Qr nM+XWpdRei3bZhf1uhw2kTIbKBlZ0Iw8g7VjhEwP5xtv8L7QFBXf04w0q3PwM82lhtxu 8c+AJrfNjtcG03qIjF+9EcS+xHN7crWo4HNKxVSAdjUm20nImWMJT1QEDBOLSkzE4zic 6ZBw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id d82si623691wmd.1.2017.09.12.06.02.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 06:02:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from [10.0.2.15] ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id v8CD2WvK004866 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Tue, 12 Sep 2017 15:02:34 +0200 Subject: Re: [PATCH v3 2/5] isar: Change build folders tree To: Henning Schild Cc: isar-users@googlegroups.com References: <20170911192738.1323-1-asmirnov@ilbers.de> <20170911192738.1323-3-asmirnov@ilbers.de> <20170912145206.47fe2ed2@md1em3qc> From: Alexander Smirnov Message-ID: Date: Tue, 12 Sep 2017 16:02:27 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170912145206.47fe2ed2@md1em3qc> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: igj5hNSFEeMh On 09/12/2017 03:52 PM, Henning Schild wrote: > 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##. > Already caught this issue during CI builds,fixed in my reply to this patch (I've resent this patch in-reply-to). Alex > Henning > >> # Create root filesystem >> sudo multistrap -a ${DISTRO_ARCH} -d "${BUILDCHROOT_DIR}" -f >> "${WORKDIR}/multistrap.conf" || true >