From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6680483261914808320 X-Received: by 2002:adf:fb0d:: with SMTP id c13mr2283559wrr.214.1556098063882; Wed, 24 Apr 2019 02:27:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:8083:: with SMTP id 3ls2155748wrl.9.gmail; Wed, 24 Apr 2019 02:27:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqzNoYnqjbjInkoOVf0lj138ZBc/Ic0LvWqyEGjJupDqbqRfXKAkhR52mQJlurGn0hLkiTk5 X-Received: by 2002:adf:9144:: with SMTP id j62mr22172602wrj.320.1556098063480; Wed, 24 Apr 2019 02:27:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556098063; cv=none; d=google.com; s=arc-20160816; b=gIObwJc4BheZct7b6k+lQIa7MPlCFV/MrtcHsY3QbtnMdXh1CInaBxHROX3FbUWcs2 LQPoDGqorSf25PW7EG9nTn5HLNhKzeObFSay9B353/uMVZxI6o+WrPqtnQMPrszi7PzE ifPhbdXUStV4bheorPx8+sa9gDuCYF7Czq2gbaM2XUwjLm1c9DuBuySPvw2F82Lqg9p9 9alecC9fEL1jCO+jdpvMaTm0CS6/+f4Q+MHUp7QsE1GrDykFvcJt9xK6yjuv7HPkFu7y R9TzV5sK2saK8RiLmSja/MCet4cpmT60BCZNHcIg6norbvWqEfCpDBPnY9e0x5VaQYHx OzuQ== 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:date:subject:cc:to:from; bh=sPGlxVo6Dj4jMBJTm8xqlqBQVkMEDqP1jhXS0TwXzFc=; b=oEQZoMphgU02WpQSt4mq5x7i012m+3MctuZsH7fA9D1BpycofWhqas4ce32tVQwt0h PnOPviHCruNYG7UegT1Z+SDHcDQZMaAvb1jEs17mHFKDHrQ0xjYsZQyEnCeIPbRdjSXn +/QLb2GKjB5jeQCXW32bLmpIAAFeSdtM2UHW5Ci+7CWBqagdIcxdIl9n3G6druK2TgwE C8HeGWkTJYxpl0MlCkXn+oqWicp6Bprre6KIWI1vy9/Xa80AjiHYCyOOcI2RRra0pKUR BVaq00BQmqw9hHDfKKtWulEMSjnap++S86kAsXCk71rc9D8bDqWDs9/T+E9MVqbaEspm sbEg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id 61si528751wra.0.2019.04.24.02.27.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 02:27:43 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x3O9RgxH004894 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Apr 2019 11:27:42 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x3O9Rflq018534; Wed, 24 Apr 2019 11:27:42 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v3 4/8] isar-bootstrap/buildchroot/sdkchroot: refactor PF and WORKDIR Date: Wed, 24 Apr 2019 11:27:30 +0200 Message-Id: <20190424092734.14167-5-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190424092734.14167-1-claudius.heine.ext@siemens.com> References: <20190424092734.14167-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: ihllJNTzz5Zj From: Claudius Heine Each of those are dependent on both HOST_ARCH and DISTRO_ARCH, so the stamps etc. should not be shared. Signed-off-by: Claudius Heine --- meta/classes/image-sdk-extension.bbclass | 2 +- meta/conf/bitbake.conf | 4 ++-- .../isar-bootstrap/isar-bootstrap-host.bb | 11 +++-------- .../isar-bootstrap/isar-bootstrap-target.bb | 6 +----- meta/recipes-devtools/buildchroot/buildchroot-host.bb | 1 + meta/recipes-devtools/buildchroot/buildchroot.inc | 3 +-- meta/recipes-devtools/sdkchroot/sdkchroot.bb | 3 +-- 7 files changed, 10 insertions(+), 20 deletions(-) diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index 1838080..8df3ed1 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -5,7 +5,7 @@ # # This class extends the image.bbclass to supply the creation of a sdk -SDKCHROOT_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/sdkchroot-${HOST_DISTRO}-${HOST_ARCH}" +SDKCHROOT_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/sdkchroot-${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}" do_populate_sdk[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_populate_sdk[depends] = "sdkchroot:do_build" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 0e521bb..7c1c89f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -50,8 +50,8 @@ DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" DL_DIR ?= "${TOPDIR}/downloads" SSTATE_DIR ?= "${TMPDIR}/sstate-cache" -BUILDCHROOT_HOST_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-host/rootfs" -BUILDCHROOT_TARGET_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-target/rootfs" +BUILDCHROOT_HOST_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-host-${DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}/rootfs" +BUILDCHROOT_TARGET_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-target-${DISTRO}-${DISTRO_ARCH}/rootfs" CACHE = "${TMPDIR}/cache" OVERRIDES = "${DISTRO_ARCH}:${MACHINE}:${DISTRO}:forcevariable" diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb index 08b068f..6d0f5f5 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb @@ -6,17 +6,13 @@ # SPDX-License-Identifier: MIT Description = "Minimal host Debian root file system" +PF = "${PN}-${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}" -WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${HOST_DISTRO}-${HOST_ARCH}" -DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}" -ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}.lock" +DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}" +ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}.lock" require isar-bootstrap.inc -inherit isar-bootstrap-helper -do_generate_keyring[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" - -do_apt_config_prepare[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" do_apt_config_prepare[dirs] = "${WORKDIR}" do_apt_config_prepare[vardeps] += "\ APTPREFS \ @@ -47,7 +43,6 @@ addtask apt_config_prepare before do_bootstrap after do_unpack OVERRIDES_append = ":${@get_distro_needs_https_support(d, True)}" -do_bootstrap[stamp-extra-info] = "${HOST_DISTRO}-${HOST_ARCH}" do_bootstrap[vardeps] += "HOST_DISTRO_APT_SOURCES" do_bootstrap() { isar_bootstrap --host diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb index 79f3e34..552a317 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb @@ -6,16 +6,13 @@ # SPDX-License-Identifier: MIT Description = "Minimal target Debian root file system" +PF = "${PN}-${DISTRO}-${DISTRO_ARCH}" -WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${DISTRO}-${DISTRO_ARCH}" ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${DISTRO}-${DISTRO_ARCH}.lock" require isar-bootstrap.inc -do_generate_keyring[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" - -do_apt_config_prepare[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" do_apt_config_prepare[dirs] = "${WORKDIR}" do_apt_config_prepare[vardeps] += "\ APTPREFS \ @@ -44,7 +41,6 @@ addtask apt_config_prepare before do_bootstrap after do_unpack OVERRIDES_append = ":${@get_distro_needs_https_support(d, False)}" -do_bootstrap[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" do_bootstrap[vardeps] += "DISTRO_APT_SOURCES" do_bootstrap() { isar_bootstrap diff --git a/meta/recipes-devtools/buildchroot/buildchroot-host.bb b/meta/recipes-devtools/buildchroot/buildchroot-host.bb index c8c10c0..e8f7f69 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot-host.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot-host.bb @@ -6,6 +6,7 @@ DESCRIPTION = "Isar development filesystem for host" require buildchroot.inc +PF = "${PN}-${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}" BUILDCHROOT_PREINSTALL ?= "make \ debhelper \ diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc index 764bc5e..cdb4c07 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.inc +++ b/meta/recipes-devtools/buildchroot/buildchroot.inc @@ -12,13 +12,12 @@ SRC_URI = "file://configscript.sh \ file://common.sh \ file://deps.sh" PV = "1.0" +PF = "${PN}-${DISTRO}-${DISTRO_ARCH}" inherit isar-bootstrap-helper -WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" BUILDCHROOT_DIR = "${WORKDIR}/rootfs" -do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" do_build[root_cleandirs] = "${BUILDCHROOT_DIR} \ ${BUILDCHROOT_DIR}/isar-apt \ ${BUILDCHROOT_DIR}/downloads \ diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb index 895a454..822d4bb 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -14,6 +14,7 @@ SRC_URI = " \ PV = "0.1" inherit isar-bootstrap-helper +PF = "${PN}-${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}" SDKCHROOT_PREINSTALL := "debhelper \ autotools-dev \ @@ -25,11 +26,9 @@ SDKCHROOT_PREINSTALL := "debhelper \ devscripts \ equivs" -WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${HOST_DISTRO}-${HOST_ARCH}" S = "${WORKDIR}/rootfs" do_build[dirs] = "${DEPLOY_DIR_IMAGE}" -do_build[stamp-extra-info] = "${HOST_DISTRO}-${HOST_ARCH}" do_build[root_cleandirs] = "${S} \ ${S}/isar-apt" -- 2.20.1