From: "Maxim Yu. Osipov" <mosipov@ilbers.de>
To: Cedric Hombourger <Cedric_Hombourger@mentor.com>,
isar-users@googlegroups.com
Subject: Re: [PATCH] bootstrap: move to tmp/deploy/bootstrap
Date: Fri, 23 Nov 2018 13:23:41 +0300 [thread overview]
Message-ID: <5fb99280-6b60-1d5e-729e-ecd26bb2fd91@ilbers.de> (raw)
In-Reply-To: <1542792909-274-1-git-send-email-Cedric_Hombourger@mentor.com>
On 11/21/18 12:35 PM, Cedric Hombourger wrote:
> 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).
Applied to the 'next',
Thanks,
Maxim.
> Suggested-by: Jan Kiszka <jan.kiszka@siemens.com>
> Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
> ---
> 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=""
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
next prev parent reply other threads:[~2018-11-23 10:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-09 19:33 [PATCH 0/2] add MACHINE to DEPLOY_DIR_IMAGE Cedric Hombourger
2018-11-09 19:33 ` [PATCH 1/2] start_vm: get DEPLOY_DIR_IMAGE from bitbake Cedric Hombourger
2018-11-09 19:33 ` [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE Cedric Hombourger
2018-11-13 7:52 ` Jan Kiszka
2018-11-21 8:10 ` Jan Kiszka
2018-11-21 8:13 ` chombourger
2018-11-21 8:18 ` chombourger
2018-11-21 8:19 ` Jan Kiszka
2018-11-21 8:39 ` chombourger
2018-11-21 9:06 ` Jan Kiszka
2018-11-21 9:08 ` Jan Kiszka
2018-11-21 9:17 ` chombourger
2018-11-21 9:35 ` [PATCH] bootstrap: move to tmp/deploy/bootstrap Cedric Hombourger
2018-11-21 14:48 ` Jan Kiszka
2018-11-23 10:23 ` Maxim Yu. Osipov [this message]
2018-11-21 8:20 ` [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE Jan Kiszka
2018-11-21 8:44 ` chombourger
2018-11-14 3:20 ` [PATCH 0/2] " Maxim Yu. Osipov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5fb99280-6b60-1d5e-729e-ecd26bb2fd91@ilbers.de \
--to=mosipov@ilbers.de \
--cc=Cedric_Hombourger@mentor.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox