From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6621946372691066880 X-Received: by 2002:a25:5d12:: with SMTP id r18-v6mr2404324ybb.1.1542792939018; Wed, 21 Nov 2018 01:35:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:3888:: with SMTP id f130-v6ls998602yba.15.gmail; Wed, 21 Nov 2018 01:35:38 -0800 (PST) X-Google-Smtp-Source: AFSGD/VWQyOoICzbmZGXKsKrQCz1bIO/B55aqpjYDvlxG9Jdtaz3pSjbXpc0LlfwMSPHoHWgEeSc X-Received: by 2002:a25:c704:: with SMTP id w4-v6mr2237251ybe.45.1542792938734; Wed, 21 Nov 2018 01:35:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542792938; cv=none; d=google.com; s=arc-20160816; b=YlW7FiFHamXOJ7Dc10733LzZY8nJEekX+FuxeI5Wcvb3A+sv6cyTPQ86isYKA0cEgr 5Hl6uzupDDZe6WDAhiM3xqJG2ZlTqf/+qaIHdHN8CFNvh9ETSBqGlvZbOWka1gzKdrSR yXHWayer0AoMlLpVaVcdzxHd/rmKToM7C/lY4D3iWpFoO8GFlVAKJaP5Eq+tvzeJFihK CH/AHn99WyplBT5i3PmcPyJrwe2ho0d3iv0vU6LEWhfxOZDzgHnGOxO2QKr1HmWwJ/lJ jhb3SZR+Zb7um/FxgPyNANhebweXCNcWuWJ1pVvOa1gIa92LgVsaOL2MZY9lOpto8o4S V2Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=TCacObmwDIxE2rIfW7sFonA6IJcWSL9/Nb5fpnZw+hY=; b=JHqMTvELMLV3rc6IFJUATutIZy9xBciyesaBpHdObO24SaQmL8OBSFEN11VvNCzi57 kwJqnpCl7N5QBifwp471p5Q+/Ad8+EbxHmEfMUT6V9tKmHnWHvEycAvxbykBCjrVmmvr HphNp3e/+r3skvsKZGh1+ZrapSHJtij82VjktgWt8p4IZH/2s2BBz/Y8t7pu+D/qraiE tMYzT6fOp3wtgXZ/PB3CTsFz0xvgpF/phR3eYihQuodxHNe4M4dFfvlc/dpgjKGVlpcs 3pnlKaPPMLW8BmdqkRt+FoPP8H2v/YgiCU/1CpfVYY3d5FwDm9vqc1ILWYPPxHTc86Vb QEkA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from relay1.mentorg.com (relay1.mentorg.com. [192.94.38.131]) by gmr-mx.google.com with ESMTPS id l184-v6si629824ywg.3.2018.11.21.01.35.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 01:35:38 -0800 (PST) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) client-ip=192.94.38.131; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Received: from nat-ies.mentorg.com ([192.94.31.2] helo=svr-ies-mbx-02.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1gPOv3-0001zp-8S from Cedric_Hombourger@mentor.com for isar-users@googlegroups.com; Wed, 21 Nov 2018 01:35:37 -0800 Received: from FRG-W10-HOMBOUR.world.mentorg.com (137.202.0.90) by svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Wed, 21 Nov 2018 09:35:33 +0000 From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH] bootstrap: move to tmp/deploy/bootstrap Date: Wed, 21 Nov 2018 10:35:09 +0100 Message-ID: <1542792909-274-1-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <3edbd39e-dc42-b874-5f02-71bade02e5cc@siemens.com> References: <3edbd39e-dc42-b874-5f02-71bade02e5cc@siemens.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-09.mgc.mentorg.com (139.181.222.9) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: fIocxMUlp4sq Bootstraps should not be placed in tmp/deploy/images/${MACHINES} since they are only distro and architecture dependent (but not machine dependent). The older location was apparently causing some build failures for large multiconfig builds (while this issue was not reproduced, multiconfig builds were done to make sure the change did not introduce obvious regressions). Suggested-by: Jan Kiszka Signed-off-by: Cedric Hombourger --- meta/classes/isar-bootstrap-helper.bbclass | 2 +- meta/conf/isar-bitbake.conf | 1 + meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb | 4 ++-- meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb | 4 ++-- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass index e6a46ce..f41682e 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass +++ b/meta/classes/isar-bootstrap-helper.bbclass @@ -83,7 +83,7 @@ setup_root_file_system() { CLEAN_FILES="${ROOTFSDIR}/etc/hostname ${ROOTFSDIR}/etc/resolv.conf" sudo cp -Trpfx \ - "${DEPLOY_DIR_IMAGE}/isar-bootstrap-$ROOTFS_DISTRO-$ROOTFS_ARCH/" \ + "${DEPLOY_DIR_BOOTSTRAP}/$ROOTFS_DISTRO-$ROOTFS_ARCH/" \ "$ROOTFSDIR" [ -n "${FSTAB}" ] && cat ${FSTAB} | sudo tee "$ROOTFSDIR/etc/fstab" diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf index d552c03..bc52d08 100644 --- a/meta/conf/isar-bitbake.conf +++ b/meta/conf/isar-bitbake.conf @@ -19,6 +19,7 @@ # OTHER DEALINGS IN THE SOFTWARE. WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PF}" +DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" DL_DIR = "${TOPDIR}/downloads" SSTATE_DIR ?= "${TMPDIR}/sstate-cache" diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb index 55696ea..19b60dc 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb @@ -8,8 +8,8 @@ Description = "Minimal host Debian root file system" WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${HOST_DISTRO}-${HOST_ARCH}" -DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_IMAGE}/isar-bootstrap-${HOST_DISTRO}-${HOST_ARCH}" -ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_IMAGE}/isar-bootstrap-${HOST_DISTRO}-${HOST_ARCH}.lock" +DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}" +ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}.lock" include isar-bootstrap.inc inherit isar-bootstrap-helper diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb index 5752b14..3631506 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb @@ -8,8 +8,8 @@ Description = "Minimal target Debian root file system" WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" -DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_IMAGE}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}" -ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_IMAGE}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}.lock" +DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${DISTRO}-${DISTRO_ARCH}" +ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${DISTRO}-${DISTRO_ARCH}.lock" include isar-bootstrap.inc diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 21454b0..be417a0 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -165,7 +165,7 @@ def get_host_release(): do_bootstrap[vardeps] += "DISTRO_APT_PREMIRRORS" -do_bootstrap[dirs] = "${DEPLOY_DIR_IMAGE}" +do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}" isar_bootstrap() { IS_HOST="" -- 2.11.0