From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6680483261914808320 X-Received: by 2002:ac2:44b2:: with SMTP id c18mr20445260lfm.86.1556199945151; Thu, 25 Apr 2019 06:45:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9a8b:: with SMTP id p11ls2200382lji.11.gmail; Thu, 25 Apr 2019 06:45:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqxEgJXIRKBYn70bek4XD91wCXX5lJf+WPRYUlqDCmIo+L7WhEHtJrKusC9wwJVbK2GRJ23S X-Received: by 2002:a2e:12c4:: with SMTP id 65mr20791325ljs.141.1556199944521; Thu, 25 Apr 2019 06:45:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556199944; cv=none; d=google.com; s=arc-20160816; b=oibKhDjiiYKIqepi60bXFMDQtNB9P9NkjGGBf7A3e03/EEYwafr/suCI1vVhCG9SQO MPh/DaStN6d9v9zG0z1F4WunNyFrRg1C/SFOv+OcMnGmcgqqtkGbWROel0WIWKyGBQWH FDOrsZufRybztSLuB46CYoUI8Libq4NToytAJOLMt6WiAgjh17FPbIxp3rMHYSTFX3dH WnJNKbc4lxz56p/B57QQiHN/JHor+BxrgvOzKvafqLIaIqeUx+NJFGrrH1RE/V2l77g6 P18XEaTcuRPWZ1vsIxcwXIUxfv6XO+mHnxMcGMgZ8w1HTYSoJR+PIcnEE2S/2mIkGDWa Wb9Q== 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=SqktXH+8bso1qKUFG8v10sL3i2P6Uj5N6IpLUYXfRAY=; b=jVWw6e3n9IB+SN7QhQxS7WEElpGTeD3OlT0EjdkmKf3BBlK+/wx8A3wq8io2ZfuTv5 dJmFUYYS7F/pCDYJb2y/e7Y61lr9QQQcOGQo2fjk3tV0HaSH73wfb3HIzNvG3gvTSZtd uw1834J7ks0yX3exiOZ/F3OaRE5xHkKzKJpoO+/oXxYdYpfWpiPJ/3mwJzALYXnKm51r kc2WM+v5PmlZeh99O7Annphb9mhVmS8cGyjhqkPj+u0QjN8U/oCfW1OfNIWVFg1DCTpT ZMSO32KhCcWTmAZc2CyY6+1sVBAZkbXmwoYVYPAGts/N9kzGkIpJdO30q9WvcNYRxoPw JLYg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id u30si373578lfn.4.2019.04.25.06.45.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 06:45:44 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x3PDjhx0011794 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 Apr 2019 15:45:43 +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 x3PDjhOM017181; Thu, 25 Apr 2019 15:45:43 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v4 5/9] isar-bootstrap/buildchroot/sdkchroot: refactor PF and WORKDIR Date: Thu, 25 Apr 2019 15:44:46 +0200 Message-Id: <20190425134450.13443-6-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425134450.13443-1-claudius.heine.ext@siemens.com> References: <20190425134450.13443-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: CFm6yQE0yOOL 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/classes/isar-bootstrap-helper.bbclass | 4 ++-- 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 | 4 ++-- meta/recipes-devtools/buildchroot/buildchroot.inc | 3 +-- meta/recipes-devtools/sdkchroot/sdkchroot.bb | 5 ++--- 8 files changed, 14 insertions(+), 25 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/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass index 0d77929..8612be2 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass +++ b/meta/classes/isar-bootstrap-helper.bbclass @@ -52,8 +52,8 @@ setup_root_file_system() { --clean) CLEAN=1 ;; --copyisarapt) COPYISARAPT=1 ;; --fstab) FSTAB=$2; shift ;; - --host-arch) ROOTFS_ARCH=${HOST_ARCH} ;; - --host-distro) ROOTFS_DISTRO=${HOST_DISTRO} ;; + --host-arch) ROOTFS_ARCH="$2-$ROOTFS_ARCH"; shift ;; + --host-distro) ROOTFS_DISTRO="$2"; shift ;; --keep-apt-cache) KEEP_APT_CACHE=1 ;; -*) bbfatal "$0: invalid option specified: $1" ;; *) break ;; diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 0e521bb..9eb14ac 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-${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 3e96281..2e2e6d1 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb @@ -6,19 +6,15 @@ # 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 # We only build debian host buildchroot environments DISTRO_APT_KEYS = "" -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 \ @@ -49,7 +45,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..12a1fdf 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 \ @@ -26,6 +27,5 @@ BUILDCHROOT_PREINSTALL_append_armhf += "binutils-arm-linux-gnueabihf \ BUILDCHROOT_PREINSTALL_append_arm64 += "binutils-aarch64-linux-gnu \ crossbuild-essential-arm64" - -PARAMS = "--host-arch --host-distro" +PARAMS = "--host-arch '${HOST_ARCH}' --host-distro '${HOST_DISTRO}'" do_build[depends] = "isar-apt:do_cache_config isar-bootstrap-host:do_bootstrap" 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..49aeb47 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" @@ -50,7 +49,7 @@ do_build() { packages="${SDKCHROOT_PREINSTALL} crossbuild-essential-${DISTRO_ARCH}" fi - setup_root_file_system --copyisarapt --host-arch --host-distro "${S}" $packages + setup_root_file_system --copyisarapt --host-arch '${HOST_ARCH}' --host-distro '${HOST_DISTRO}' "${S}" $packages # Configure root filesystem sudo install -m 644 ${WORKDIR}/README.sdk ${S} -- 2.20.1