Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE

[chombourger@gmail.com]

[-- 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 --]