From: Jan Kiszka <jan.kiszka@siemens.com>
To: chombourger@gmail.com, isar-users <isar-users@googlegroups.com>
Subject: Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE
Date: Wed, 21 Nov 2018 10:08:29 +0100 [thread overview]
Message-ID: <0f323018-58fb-6b92-11ab-5f644549e4b1@siemens.com> (raw)
In-Reply-To: <3edbd39e-dc42-b874-5f02-71bade02e5cc@siemens.com>
On 21.11.18 10:06, Jan Kiszka wrote:
> On 21.11.18 09:39, chombourger@gmail.com wrote:
>> It should, but I only tried jailhouse-images so far, but that requires local
>> patches to move the Isar version forward (plus a bitbake fix).
>>
>>
>> I may not have luck today - the multiconfig build I tried succeeded. I guess I
>> can still look at the change we discussed with the hope that it would fix your
>> build failures
>>
>
> I've successfully tested this now:
>
> diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass
> index e6a46ce..0db2492 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}/isar-bootstrap-$ROOTFS_DISTRO-$ROOTFS_ARCH/" \
> "$ROOTFSDIR"
> [ -n "${FSTAB}" ] && cat ${FSTAB} | sudo tee "$ROOTFSDIR/etc/fstab"
>
> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb
> index 55696ea..9c4292c 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}/isar-bootstrap-${HOST_DISTRO}-${HOST_ARCH}"
> +ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR}/isar-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..ae82df6 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}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}"
> +ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR}/isar-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..a0cd441 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}"
>
> isar_bootstrap() {
> IS_HOST=""
>
>
> Jan
>
...but we can also add "bootstrap/" to that path, to keep the deploy dir cleaner.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
next prev parent reply other threads:[~2018-11-21 9:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-09 19:33 [PATCH 0/2] " 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 [this message]
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
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=0f323018-58fb-6b92-11ab-5f644549e4b1@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=chombourger@gmail.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