From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6690944878080163840 X-Received: by 2002:a19:c394:: with SMTP id t142mr13355675lff.102.1557857005590; Tue, 14 May 2019 11:03:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:2e04:: with SMTP id u4ls8646lju.5.gmail; Tue, 14 May 2019 11:03:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqwrgmJ8tkChLLz39Ex2uaeDsHYqzfhEwc1X7Zt5Vp/XkGvJVBS7E6zKUSUZ9TUJioj2jXcV X-Received: by 2002:a2e:8796:: with SMTP id n22mr5517151lji.75.1557857005129; Tue, 14 May 2019 11:03:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557857005; cv=none; d=google.com; s=arc-20160816; b=K99NY1iAybeWqN2t8qUal+vttzSPX8FOJg6syYw8ujOgrxLuJP2T7LUF8AeJZ7gyJi ehsCA77vEuJ2Cnl2aVsjCShwGB195HPg5wCBRcMO9+iIU1la4dmKY7W7hPz/ea5QU4PO Lzc7htcXJMMHXMSf3aaTbJQyE4NEBEFmugIXW1EV2PzoaDe8eg+0IQaYNcUhuaWVxgZV Tz3NGcPRQzqflZBmLjyjhzJQwHeTMf9wvvGzdb4MUVoVn4iSrwGuw2YRq9LKC16zn4tj kq/dtbmf4QgzPZOp15LmiTYiSWEhpyvDpfh8WoKrBynBEbZ3we/KVYMVT/57p37evnap 5oQw== 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:to:from; bh=fXn4mDzzd2vRa/+Fup/oCm8F1FDOpJhhU3xKLWPgKgc=; b=g1yKLWdNK0Z8q3NoCNg4GipQ6Fb4DjKdmqDVvhezHO159dHkLjTvcvACbnA1nwCQHj ynFV06J0038RNL9OSccwZ12+zEfkjWCLEPmSPzBbumRMBR0gMRaGdts2PIzo8eUjciJE quuypRNVNRttfGC/dVCd7rKmlMwOoHZh467nMs1bY7LGhwbhvlC75Ry//8cTOKOXdvTb BgpoPGL6agpiSqUWWrxclM4p6ajDHP3ZwbUK52Cjivdm5WpbrEalkXqHWMxX4uy9koYA 9d8XWoRi9OWzneuFxvdTiJbJTnCnO+Vm/LT0FHRPK1uVHUJoapmgqESFfeQlPTb34keB jiVQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id s187si1887409lfe.4.2019.05.14.11.03.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 May 2019 11:03:25 -0700 (PDT) Received-SPF: pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x4EI31w9001363 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 14 May 2019 20:03:24 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH v5 5/9] isar-bootstrap/buildchroot/sdkchroot: refactor PF and WORKDIR Date: Tue, 14 May 2019 20:02:56 +0200 Message-Id: <20190514180300.27164-6-mosipov@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190514180300.27164-1-mosipov@ilbers.de> References: <20190514180300.27164-1-mosipov@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: Tjmsze5m+l81 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 [Maxim: rebased] Signed-off-by: Maxim Yu. Osipov --- meta/classes/image-sdk-extension.bbclass | 2 +- meta/classes/isar-bootstrap-helper.bbclass | 4 ++-- meta/conf/bitbake.conf | 4 ++-- meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb | 11 +++-------- meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb | 6 +----- meta/recipes-devtools/buildchroot/buildchroot-host.bb | 3 ++- meta/recipes-devtools/buildchroot/buildchroot.inc | 3 +-- meta/recipes-devtools/sdkchroot/sdkchroot.bb | 5 ++--- 8 files changed, 14 insertions(+), 24 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 3a79df3..6bd644b 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -51,8 +51,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 5501e35..ee8f362 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_BOOTSTRAP_KEYS = "" -inherit isar-bootstrap-helper -do_generate_keyrings[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 39f12b5..77276e9 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_keyrings[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..73cd548 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot-host.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot-host.bb @@ -4,6 +4,7 @@ # Copyright (C) 2015-2018 ilbers GmbH DESCRIPTION = "Isar development filesystem for host" +PF = "${PN}-${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}" require buildchroot.inc @@ -27,5 +28,5 @@ 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.11.0