From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6680483261914808320 X-Received: by 2002:a2e:5d90:: with SMTP id v16mr4081095lje.2.1555422222655; Tue, 16 Apr 2019 06:43:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:6b10:: with SMTP id d16ls383792lfa.16.gmail; Tue, 16 Apr 2019 06:43:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqxO2RLClt8b5fgNYsX5ghs1WSQytnwJPwU7vFi3x2k3wpe1O6KRDYLDbVB3A5Vt4uWxsC+2 X-Received: by 2002:a19:710d:: with SMTP id m13mr1410203lfc.11.1555422222102; Tue, 16 Apr 2019 06:43:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555422222; cv=none; d=google.com; s=arc-20160816; b=0tk4PT/YfpWO4+4Z6boqBhAu/l/tHCYZgt+4igJf42c7hH0lxI66MAX8Xi+GhesX3S NDUbTsR28INkkXQeCEkgTxenpF6JYr2BeKnkeigH8k5+CsqjR4Nyn11+h2dPLGQhvscv 8UaArHsFxEtTUCpF45Y5gGbIPtHVfcxWEnVnK3yZOTjZrDf/1GSZrPaJH2DEtSvjIDwL /5t/8wqSSqqXEntaqEgIWtRFAhIf+rcfmEGVRZdDvWPlEsZsoSFzTT4vyvNIDcVLlQ60 gVcw/6ASsp+6Wk4TVJnhAVix3M+LUUgb34ihJ+ZNzwOirCi5skl+z6mwzKb6Owr8UxYd JSIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:content-description :mime-version:references:message-id:subject:cc:to:from:date; bh=TWXRPvcakuvhju0EQYXK0Pc3HV432pO5WdoMX+p1dr4=; b=Jdywd8pBV+Tc86ObIc4flcfarNcuWbt+iPb94p7H8qLDFBIiojI1taBU0SAsL+yoPu Mn7vqXPEEGQ5R0SyMs0TFEqNOXRFcx2k8efbkKBV0uF2yZxTJThobX9FS/+/UHMB4oZr cxLnPEIb4gZpPTuFyAYrJHSAcy2LXtR5+/pkEa/6WL+t7h9pSv31j1cEI2pmEpFFf47Z KB9TU/0CgfOtwIvSr0ns34J/Uc58IDu0Z/ajr8T+QYsvX4+2GCMZMwsiw6LTVXUj7WJC QD5pFEoTCIoq5I0gA+MmyXHhJNtMPrtH9HiVgDi6ipsrbORiZr4Ouzb6Z/blbnPrzKaT iGPw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=andreas.reichel.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 p16si1039976ljp.1.2019.04.16.06.43.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 06:43:42 -0700 (PDT) Received-SPF: pass (google.com: domain of andreas.reichel.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 andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x3GDhe9k000306 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 16 Apr 2019 15:43:41 +0200 Received: from iiotirae (golem.ppmd.siemens.net [139.25.69.122]) by mail2.sbs.de (8.15.2/8.15.2) with SMTP id x3GDhdLK004604; Tue, 16 Apr 2019 15:43:39 +0200 Date: Tue, 16 Apr 2019 15:43:39 +0200 From: Andreas Reichel To: "[ext] claudius.heine.ext@siemens.com" Cc: isar-users@googlegroups.com, Claudius Heine Subject: Re: [PATCH 4/8] isar-bootstrap/buildchroot/sdkchroot: refactor PF and WORKDIR Message-ID: <20190416134339.GA16075@iiotirae> References: <20190416132647.3074-1-claudius.heine.ext@siemens.com> <20190416132647.3074-5-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Description: message Content-Disposition: inline In-Reply-To: <20190416132647.3074-5-claudius.heine.ext@siemens.com> User-Agent: Mutt/1.11.4 (2019-03-13) X-TUID: HTyQ9pcizhsi On Tue, Apr 16, 2019 at 03:26:42PM +0200, [ext] claudius.heine.ext@siemens.com wrote: > 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" maybe first define a variable for ${DISTRO}-${DISTRO_ARCH} and then prepend this with ${HOST_ARCH}- where needed makes the code more readable. > 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" > Same here > 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..249fa94 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}-${ROOTFS_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 > > -- > You received this message because you are subscribed to the Google Groups "isar-users" group. > To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. > To post to this group, send email to isar-users@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20190416132647.3074-5-claudius.heine.ext%40siemens.com. > For more options, visit https://groups.google.com/d/optout. -- Andreas Reichel Dipl.-Phys. (Univ.) Software Consultant Andreas.Reichel@tngtech.com, +49-174-3180074 TNG Technology Consulting GmbH, Betastr. 13a, 85774 Unterfoehring Geschaeftsfuehrer: Henrik Klagges, Dr. Robert Dahlke, Gerhard Mueller Sitz: Unterfoehring * Amtsgericht Muenchen * HRB 135082