From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6451845426797608960 X-Received: by 10.129.120.87 with SMTP id t84mr2389966ywc.160.1502187323875; Tue, 08 Aug 2017 03:15:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.107.162.81 with SMTP id l78ls2557568ioe.0.gmail; Tue, 08 Aug 2017 03:15:23 -0700 (PDT) X-Received: by 10.98.28.67 with SMTP id c64mr2238627pfc.52.1502187323771; Tue, 08 Aug 2017 03:15:23 -0700 (PDT) Received: by 10.55.10.138 with SMTP id 132msqkk; Tue, 8 Aug 2017 03:04:58 -0700 (PDT) X-Received: by 10.28.74.147 with SMTP id n19mr441608wmi.27.1502186697811; Tue, 08 Aug 2017 03:04:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502186697; cv=none; d=google.com; s=arc-20160816; b=f4X0D6U3wpghP7qf7TVU/8959JbKXTTGZtXNvuDOrg13Md9/1Iu11cgunkc3GzH/ah gEX1FJaTjdYz/Aq5kQRtfDLEJYsasn0LMd10hYN4hz2JADphsqkJADAz9rNVXj/5qusC m12OFiU9mwJMX3VK/AQLQk20nhgoJgO3+EH7kPolf9ud4p/DDHMoWqo/gBklo4GrJ99o fxkgYoEVQ7YEgOcoIqfSLjcIBzcbPTtcrE5c7QB0yMVZn0zwEclqKZZlhByg2FzCZhBU YwXs7JcZ3i/YlqpCWduJ8WslaGFYsTE3yssBRGIaJjQcW35wfrNEA80IzECEi+ZMQOYW AMBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Rw7sjOW/qnq4VhV1VcWTzYUWk/s9WOhnJGR3yZ214Jo=; b=lsGOji+DyibPwazhGgxh1HEuZj8/j9bmCNkS+cq1xKO1Yr3L6nP2wMY0yJRTVD8HJZ AqGGb+z/TTKjGVIey0aavGqHFHMUBX8YuaI8Vplur2ECgVe0Op/481Z2Gtz8iDftNM/I F3aeUS5WZP7FZkGbgB5U6VPYMJfZCoOGWxNuBFk6LU9L2OqpnjSSowgfrLHWeXIIiA+/ l3ndEGs+SgPBjOxweb1EE5C8Y7YIsTi6fS7Pr3M8MGoDYRwlJUVbs+B7mLjv2FQEkJRi sQz019xsdx7ehgiqLygdn1nKPjbSz4YM7mieW5yKfLYnYHTR4Hmszq6z+wtlSKJmlncL lgkg== 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 187si387032wmj.0.2017.08.08.03.04.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Aug 2017 03:04:57 -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 localhost.localdomain ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id v78A4aD4021408 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 8 Aug 2017 12:04:48 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH 1/4] isar: Fix mutli-distro builds in parallel Date: Tue, 8 Aug 2017 13:04:21 +0300 Message-Id: <20170808100424.19607-2-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170808100424.19607-1-asmirnov@ilbers.de> References: <20170808100424.19607-1-asmirnov@ilbers.de> X-TUID: LKkeQQP0BksO Extend stamp suffix to distinguish the same distro for various architectures. This fixes parallel build for all possible configurations. Signed-off-by: Alexander Smirnov --- meta-isar/recipes-core/images/isar-image-base.bb | 10 +++++----- meta/classes/dpkg.bbclass | 4 ++-- meta/classes/ext4-img.bbclass | 2 +- meta/classes/image.bbclass | 2 +- meta/conf/isar-bitbake.conf | 3 +-- meta/recipes-devtools/buildchroot/buildchroot.bb | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index 337c329..b679d97 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -17,11 +17,11 @@ DEPENDS += "${IMAGE_INSTALL}" IMAGE_PREINSTALL += "apt \ dbus" -WORKDIR = "${TMPDIR}/work/${PN}/${MACHINE}" +WORKDIR = "${TMPDIR}/work/${PN}/${MACHINE}/${DISTRO}" S = "${WORKDIR}/rootfs" IMAGE_ROOTFS = "${S}" -do_rootfs[stamp-extra-info] = "${MACHINE}" +do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" do_rootfs() { install -d -m 755 ${WORKDIR}/hooks_multistrap @@ -38,9 +38,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}/configscript.sh|' ${WORKDIR}/multistrap.conf - sed -i 's|##SETUP_SCRIPT##|./tmp/work/${PN}/${MACHINE}/setup.sh|' ${WORKDIR}/multistrap.conf - sed -i 's|##DIR_HOOKS##|./tmp/work/${PN}/${MACHINE}/hooks_multistrap|' ${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 cd ${TOPDIR} diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index ea422f9..7c39c68 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -11,7 +11,7 @@ PP = "/home/builder/${PN}" BUILDROOT = "${BUILDCHROOT_DIR}/${PP}" do_unpack[dirs] = "${BUILDROOT}" -do_unpack[stamp-extra-info] = "${DISTRO}" +do_unpack[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" S ?= "${BUILDROOT}" # Unpack package and put it into working directory in buildchroot @@ -31,7 +31,7 @@ python do_unpack() { addtask unpack after do_fetch before do_build -do_build[stamp-extra-info] = "${DISTRO}" +do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" # Build package from sources using build script do_build() { diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass index 65d4c11..8588626 100644 --- a/meta/classes/ext4-img.bbclass +++ b/meta/classes/ext4-img.bbclass @@ -6,7 +6,7 @@ ROOTFS_EXTRA ?= "64" EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${PN}-${MACHINE}-${DISTRO}.ext4.img" -do_ext4_image[stamp-extra-info] = "${MACHINE}" +do_ext4_image[stamp-extra-info] = "${MACHINE}-${DISTRO}" # Generate ext4 filesystem image do_ext4_image() { diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 3e4877c..a7f0d74 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -9,7 +9,7 @@ IMAGE_TYPE ?= "ext4-img" inherit ${IMAGE_TYPE} -do_populate[stamp-extra-info] = "${MACHINE}" +do_populate[stamp-extra-info] = "${MACHINE}-${DISTRO}" # Install Debian packages, that were built from sources do_populate() { diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf index ce35a22..f85f5cc 100644 --- a/meta/conf/isar-bitbake.conf +++ b/meta/conf/isar-bitbake.conf @@ -18,10 +18,9 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. - DEPLOY_DIR_DEB = "${TMPDIR}/deploy/deb/${MACHINE}" SSTATE_DIR ?= "${TMPDIR}/sstate-cache" -BUILDCHROOT_DIR = "${TOPDIR}/tmp/work/buildchroot/${DISTRO}/rootfs" +BUILDCHROOT_DIR = "${TOPDIR}/tmp/work/buildchroot/${DISTRO}-${DISTRO_ARCH}/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 ba1bc66..ccba683 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -23,7 +23,7 @@ BUILDCHROOT_PREINSTALL ?= "gcc \ WORKDIR = "${TMPDIR}/work/${PF}/${DISTRO}" -do_build[stamp-extra-info] = "${DISTRO}" +do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" do_build() { install -d -m 755 ${WORKDIR}/hooks_multistrap -- 2.1.4