* [PATCH 0/2] add MACHINE to DEPLOY_DIR_IMAGE
@ 2018-11-09 19:33 Cedric Hombourger
2018-11-09 19:33 ` [PATCH 1/2] start_vm: get DEPLOY_DIR_IMAGE from bitbake Cedric Hombourger
` (2 more replies)
0 siblings, 3 replies; 18+ messages in thread
From: Cedric Hombourger @ 2018-11-09 19:33 UTC (permalink / raw)
To: isar-users; +Cc: Cedric Hombourger
Nice suggestion from Jan, here's a patch. I am however proposing to keep fully qualified
names for our images (makes it easy to identify what the image is for when shared with
others via e-mail, FTP, SWUpdate, etc.).
Cedric Hombourger (2):
start_vm: get DEPLOY_DIR_IMAGE from bitbake
bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE
RECIPE-API-CHANGELOG.md | 5 +++++
meta/conf/isar-bitbake.conf | 1 +
scripts/start_vm | 3 ++-
3 files changed, 8 insertions(+), 1 deletion(-)
--
2.11.0
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 1/2] start_vm: get DEPLOY_DIR_IMAGE from bitbake 2018-11-09 19:33 [PATCH 0/2] add MACHINE to DEPLOY_DIR_IMAGE Cedric Hombourger @ 2018-11-09 19:33 ` Cedric Hombourger 2018-11-09 19:33 ` [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE Cedric Hombourger 2018-11-14 3:20 ` [PATCH 0/2] " Maxim Yu. Osipov 2 siblings, 0 replies; 18+ messages in thread From: Cedric Hombourger @ 2018-11-09 19:33 UTC (permalink / raw) To: isar-users; +Cc: Cedric Hombourger Get the location of Isar images from bitbake instead of assuming tmp/deploy/images. Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com> --- scripts/start_vm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/start_vm b/scripts/start_vm index 6492c54..1da0742 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -101,7 +101,8 @@ do shift done -readonly IMAGE_DIR=$BUILD_DIR/tmp/deploy/images +eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^DEPLOY_DIR_IMAGE=") +readonly IMAGE_DIR=$DEPLOY_DIR_IMAGE readonly ISARROOT="$(dirname "$0")"/.. -- 2.11.0 ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE 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 ` Cedric Hombourger 2018-11-13 7:52 ` Jan Kiszka 2018-11-14 3:20 ` [PATCH 0/2] " Maxim Yu. Osipov 2 siblings, 1 reply; 18+ messages in thread From: Cedric Hombourger @ 2018-11-09 19:33 UTC (permalink / raw) To: isar-users; +Cc: Cedric Hombourger Align with OpenEmbedded and place image artifacts in a <machine> folder in tmp/deploy/images/. Suggested-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com> --- RECIPE-API-CHANGELOG.md | 5 +++++ meta/conf/isar-bitbake.conf | 1 + 2 files changed, 6 insertions(+) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index c7b7552..95a5f96 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -6,6 +6,11 @@ Baseline: Release v0.5 Upcoming changes (v0.7) ----------------------- +### location of image artifacts + +Align with OpenEmbedded and place image artifacts in a per-machine folder placed +in tmp/deploy (to avoid collisions among other things). + ### more consistent artifact names multiconfig image artifacts are all placed in tmp/deploy/images. They include diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf index 666c4a3..d552c03 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_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" -- 2.11.0 ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE 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 0 siblings, 1 reply; 18+ messages in thread From: Jan Kiszka @ 2018-11-13 7:52 UTC (permalink / raw) To: Cedric Hombourger, isar-users On 09.11.18 20:33, Cedric Hombourger wrote: > Align with OpenEmbedded and place image artifacts in a <machine> folder > in tmp/deploy/images/. > > Suggested-by: Jan Kiszka <jan.kiszka@siemens.com> > Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com> > --- > RECIPE-API-CHANGELOG.md | 5 +++++ > meta/conf/isar-bitbake.conf | 1 + > 2 files changed, 6 insertions(+) > > diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md > index c7b7552..95a5f96 100644 > --- a/RECIPE-API-CHANGELOG.md > +++ b/RECIPE-API-CHANGELOG.md > @@ -6,6 +6,11 @@ Baseline: Release v0.5 > Upcoming changes (v0.7) > ----------------------- > > +### location of image artifacts > + > +Align with OpenEmbedded and place image artifacts in a per-machine folder placed > +in tmp/deploy (to avoid collisions among other things). > + > ### more consistent artifact names > > multiconfig image artifacts are all placed in tmp/deploy/images. They include > diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf > index 666c4a3..d552c03 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_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" > Thanks for picking this up! Looks good. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE 2018-11-13 7:52 ` Jan Kiszka @ 2018-11-21 8:10 ` Jan Kiszka 2018-11-21 8:13 ` chombourger 0 siblings, 1 reply; 18+ messages in thread From: Jan Kiszka @ 2018-11-21 8:10 UTC (permalink / raw) To: Cedric Hombourger, isar-users On 13.11.18 08:52, [ext] Jan Kiszka wrote: > On 09.11.18 20:33, Cedric Hombourger wrote: >> Align with OpenEmbedded and place image artifacts in a <machine> folder >> in tmp/deploy/images/. >> >> Suggested-by: Jan Kiszka <jan.kiszka@siemens.com> >> Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com> >> --- >> RECIPE-API-CHANGELOG.md | 5 +++++ >> meta/conf/isar-bitbake.conf | 1 + >> 2 files changed, 6 insertions(+) >> >> diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md >> index c7b7552..95a5f96 100644 >> --- a/RECIPE-API-CHANGELOG.md >> +++ b/RECIPE-API-CHANGELOG.md >> @@ -6,6 +6,11 @@ Baseline: Release v0.5 >> Upcoming changes (v0.7) >> ----------------------- >> +### location of image artifacts >> + >> +Align with OpenEmbedded and place image artifacts in a per-machine folder placed >> +in tmp/deploy (to avoid collisions among other things). >> + >> ### more consistent artifact names >> multiconfig image artifacts are all placed in tmp/deploy/images. They include >> diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf >> index 666c4a3..d552c03 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_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" >> > > Thanks for picking this up! Looks good. > But... it has a problem: This breaks isar-bootstrap-* which seems to assume to only be run once per distro-arch tuple, but it deploys now to a machine-dependent folder. So I'm getting errors when running many multiconfig targets in parallel. In general, I wonder if the target directory for isar-bootstrap was a good choice in the first place. Maybe we should put this into something like ${DEPLOY_DIR}/bootstrap? Cleans up the user-facing images folder from not really user-relevant content. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE 2018-11-21 8:10 ` Jan Kiszka @ 2018-11-21 8:13 ` chombourger 2018-11-21 8:18 ` chombourger 2018-11-21 8:20 ` [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE Jan Kiszka 0 siblings, 2 replies; 18+ messages in thread From: chombourger @ 2018-11-21 8:13 UTC (permalink / raw) To: isar-users [-- Attachment #1.1: Type: text/plain, Size: 481 bytes --] On Wednesday, November 21, 2018 at 9:10:17 AM UTC+1, Jan Kiszka wrote: > > In general, I wonder if the target directory for isar-bootstrap was a good > choice in the first place. Maybe we should put this into something like > ${DEPLOY_DIR}/bootstrap? Cleans up the user-facing images folder from not > really > user-relevant content. > > Or rather something like ${DEPLOY_DIR}/bootstrap-${DISTRO}-${DISTRO_ARCH} ? I haven't used multiconfig much, how can I reproduce this? [-- Attachment #1.2: Type: text/html, Size: 684 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE 2018-11-21 8:13 ` chombourger @ 2018-11-21 8:18 ` chombourger 2018-11-21 8:19 ` Jan Kiszka 2018-11-21 8:20 ` [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE Jan Kiszka 1 sibling, 1 reply; 18+ messages in thread From: chombourger @ 2018-11-21 8:18 UTC (permalink / raw) To: isar-users [-- Attachment #1.1: Type: text/plain, Size: 363 bytes --] On Wednesday, November 21, 2018 at 9:13:33 AM UTC+1, chomb...@gmail.com wrote: > > I haven't used multiconfig much, how can I reproduce this? > nevermind, I am assuming I can reproduce this with something like bitbake multiconfig:qemuarm-stretch:isar-image-base multiconfig:qemuamd64-stretch:isar-image-base multiconfig:qemuamd64-stretch:isar-image-debug [-- Attachment #1.2: Type: text/html, Size: 580 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE 2018-11-21 8:18 ` chombourger @ 2018-11-21 8:19 ` Jan Kiszka 2018-11-21 8:39 ` chombourger 0 siblings, 1 reply; 18+ messages in thread From: Jan Kiszka @ 2018-11-21 8:19 UTC (permalink / raw) To: chombourger, isar-users On 21.11.18 09:18, chombourger@gmail.com wrote: > > > On Wednesday, November 21, 2018 at 9:13:33 AM UTC+1, chomb...@gmail.com wrote: > > I haven't used multiconfig much, how can I reproduce this? > > > nevermind, I am assuming I can reproduce this with something like > bitbake multiconfig:qemuarm-stretch:isar-image-base > multiconfig:qemuamd64-stretch:isar-image-base > multiconfig:qemuamd64-stretch:isar-image-debug > 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). Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE 2018-11-21 8:19 ` Jan Kiszka @ 2018-11-21 8:39 ` chombourger 2018-11-21 9:06 ` Jan Kiszka 0 siblings, 1 reply; 18+ messages in thread From: chombourger @ 2018-11-21 8:39 UTC (permalink / raw) To: isar-users [-- Attachment #1.1: Type: text/plain, Size: 332 bytes --] > > 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 [-- Attachment #1.2: Type: text/html, Size: 505 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE 2018-11-21 8:39 ` chombourger @ 2018-11-21 9:06 ` Jan Kiszka 2018-11-21 9:08 ` Jan Kiszka 2018-11-21 9:35 ` [PATCH] bootstrap: move to tmp/deploy/bootstrap Cedric Hombourger 0 siblings, 2 replies; 18+ messages in thread From: Jan Kiszka @ 2018-11-21 9:06 UTC (permalink / raw) To: chombourger, isar-users 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 -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE 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 1 sibling, 1 reply; 18+ messages in thread From: Jan Kiszka @ 2018-11-21 9:08 UTC (permalink / raw) To: chombourger, isar-users 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE 2018-11-21 9:08 ` Jan Kiszka @ 2018-11-21 9:17 ` chombourger 0 siblings, 0 replies; 18+ messages in thread From: chombourger @ 2018-11-21 9:17 UTC (permalink / raw) To: isar-users [-- Attachment #1.1: Type: text/plain, Size: 4007 bytes --] true, that's exactly what I did locally. patch will be posted in a sec On Wednesday, November 21, 2018 at 10:08:31 AM UTC+1, Jan Kiszka wrote: > > On 21.11.18 10:06, Jan Kiszka wrote: > > On 21.11.18 09:39, chomb...@gmail.com <javascript:> 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 > [-- Attachment #1.2: Type: text/html, Size: 8757 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH] bootstrap: move to tmp/deploy/bootstrap 2018-11-21 9:06 ` Jan Kiszka 2018-11-21 9:08 ` Jan Kiszka @ 2018-11-21 9:35 ` Cedric Hombourger 2018-11-21 14:48 ` Jan Kiszka 2018-11-23 10:23 ` Maxim Yu. Osipov 1 sibling, 2 replies; 18+ messages in thread From: Cedric Hombourger @ 2018-11-21 9:35 UTC (permalink / raw) To: isar-users; +Cc: Cedric Hombourger 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 <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="" -- 2.11.0 ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] bootstrap: move to tmp/deploy/bootstrap 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 1 sibling, 0 replies; 18+ messages in thread From: Jan Kiszka @ 2018-11-21 14:48 UTC (permalink / raw) To: Cedric Hombourger, isar-users On 21.11.18 10:35, 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). > > 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="" > Looks good, thanks! Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] bootstrap: move to tmp/deploy/bootstrap 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 1 sibling, 0 replies; 18+ messages in thread From: Maxim Yu. Osipov @ 2018-11-23 10:23 UTC (permalink / raw) To: Cedric Hombourger, isar-users 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE 2018-11-21 8:13 ` chombourger 2018-11-21 8:18 ` chombourger @ 2018-11-21 8:20 ` Jan Kiszka 2018-11-21 8:44 ` chombourger 1 sibling, 1 reply; 18+ messages in thread From: Jan Kiszka @ 2018-11-21 8:20 UTC (permalink / raw) To: chombourger, isar-users On 21.11.18 09:13, chombourger@gmail.com wrote: > > > On Wednesday, November 21, 2018 at 9:10:17 AM UTC+1, Jan Kiszka wrote: > > In general, I wonder if the target directory for isar-bootstrap was a good > choice in the first place. Maybe we should put this into something like > ${DEPLOY_DIR}/bootstrap? Cleans up the user-facing images folder from not > really > user-relevant content. > > > Or rather something like ${DEPLOY_DIR}/bootstrap-${DISTRO}-${DISTRO_ARCH} ? Yes, makes sense. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE 2018-11-21 8:20 ` [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE Jan Kiszka @ 2018-11-21 8:44 ` chombourger 0 siblings, 0 replies; 18+ messages in thread From: chombourger @ 2018-11-21 8:44 UTC (permalink / raw) To: isar-users [-- Attachment #1.1: Type: text/plain, Size: 281 bytes --] > > > Or rather something like > ${DEPLOY_DIR}/bootstrap-${DISTRO}-${DISTRO_ARCH} ? > > Yes, makes sense. > > After taking a closer look, your proposal makes more sense as the bootstrap recipes already use DISTRO/HOST variables to construct the name of the output directory [-- Attachment #1.2: Type: text/html, Size: 465 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/2] add MACHINE to DEPLOY_DIR_IMAGE 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-14 3:20 ` Maxim Yu. Osipov 2 siblings, 0 replies; 18+ messages in thread From: Maxim Yu. Osipov @ 2018-11-14 3:20 UTC (permalink / raw) To: Cedric Hombourger, isar-users On 11/9/18 10:33 PM, Cedric Hombourger wrote: > Nice suggestion from Jan, here's a patch. I am however proposing to keep fully qualified > names for our images (makes it easy to identify what the image is for when shared with > others via e-mail, FTP, SWUpdate, etc.). Applied to the 'next', Thanks, Maxim. > Cedric Hombourger (2): > start_vm: get DEPLOY_DIR_IMAGE from bitbake > bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE > > RECIPE-API-CHANGELOG.md | 5 +++++ > meta/conf/isar-bitbake.conf | 1 + > scripts/start_vm | 3 ++- > 3 files changed, 8 insertions(+), 1 deletion(-) > -- 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 ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2018-11-23 10:23 UTC | newest] Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 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 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
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox