From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6621946372691066880 Date: Wed, 21 Nov 2018 01:17:22 -0800 (PST) From: chombourger@gmail.com To: isar-users Message-Id: <78e0558a-9e4c-46fa-959d-ea1da6d8c9ca@googlegroups.com> In-Reply-To: <0f323018-58fb-6b92-11ab-5f644549e4b1@siemens.com> References: <1541792023-514-1-git-send-email-Cedric_Hombourger@mentor.com> <1541792023-514-3-git-send-email-Cedric_Hombourger@mentor.com> <72f412ad-018d-0c56-1a30-b2a6d99e7247@siemens.com> <08788855-6795-4bf3-b81f-67d2fefa98ce@googlegroups.com> <52e7a6ec-d1b3-4f31-8c3f-cff090a35b9f@googlegroups.com> <34f56320-572d-bef1-1b3f-06c8ef17583f@siemens.com> <3edbd39e-dc42-b874-5f02-71bade02e5cc@siemens.com> <0f323018-58fb-6b92-11ab-5f644549e4b1@siemens.com> Subject: Re: [PATCH 2/2] bitbake.conf: add MACHINE to DEPLOY_DIR_IMAGE MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_3240_785476002.1542791842452" X-Google-Token: EKLF1N8FMyTblWUU4UU0 X-Google-IP: 192.94.31.2 X-TUID: EKXJlm0gkVbA ------=_Part_3240_785476002.1542791842452 Content-Type: multipart/alternative; boundary="----=_Part_3241_1589791836.1542791842453" ------=_Part_3241_1589791836.1542791842453 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 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 > ------=_Part_3241_1589791836.1542791842453 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
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.1= 8 10:06, Jan Kiszka wrote:
> On 21.11.18 09:39, chomb...@gmail.com wrote:
>> =C2=A0 =C2=A0 =C2=A0It should, but I only tried jailhouse-imag= es so far, but that requires local
>> =C2=A0 =C2=A0 =C2=A0patches to move the Isar version forward (= plus a bitbake fix).
>>
>>
>> I may not have luck today - the multiconfig build I tried succ= eeded. I guess I
>> can still look at the change we discussed with the hope that i= t would fix your
>> build failures
>>
>=20
> I've successfully tested this now:
>=20
> diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/met= a/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() {
> =C2=A0 =C2=A0 =C2=A0 CLEAN_FILES=3D"${ROOTFSDIR}/etc/hos= tname ${ROOTFSDIR}/etc/resolv.conf"
> =C2=A0=20
> =C2=A0 =C2=A0 =C2=A0 sudo cp -Trpfx \
> - =C2=A0 =C2=A0 =C2=A0 =C2=A0"${DEPLOY_DIR_IMAGE}/isar-b= ootstrap-$ROOTFS_DISTRO-$ROOTFS_ARCH/" \
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0"${DEPLOY_DIR}/isar-bootstr= ap-$ROOTFS_DISTRO-$ROOTFS_ARCH/" \
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "$ROOTFSDIR"
> =C2=A0 =C2=A0 =C2=A0 [ -n "${FSTAB}" ] && cat ${= FSTAB} | sudo tee "$ROOTFSDIR/etc/fstab"
> =C2=A0=20
> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-h= ost.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 @@
> =C2=A0 Description =3D "Minimal host Debian root file system&= quot;
> =C2=A0=20
> =C2=A0 WORKDIR =3D "${TMPDIR}/work/${DISTRO}-${DISTRO_AR= CH}/${PN}-${HOST_DISTRO}-${HOST_ARCH}"
> -DEPLOY_ISAR_BOOTSTRAP =3D "${DEPLOY_DIR_IMAGE}/isar-boo= tstrap-${HOST_DISTRO}-${HOST_ARCH}"
> -ISAR_BOOTSTRAP_LOCK =3D "${DEPLOY_DIR_IMAGE}/isar-boots= trap-${HOST_DISTRO}-${HOST_ARCH}.lock"
> +DEPLOY_ISAR_BOOTSTRAP =3D "${DEPLOY_DIR}/isar-bootstrap-${HOST_DISTRO}-${HOST_ARCH}"
> +ISAR_BOOTSTRAP_LOCK =3D "${DEPLOY_DIR}/isar-bootstrap-$= {HOST_DISTRO}-${HOST_ARCH}.lock"
> =C2=A0=20
> =C2=A0 include isar-bootstrap.inc
> =C2=A0 inherit isar-bootstrap-helper
> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstr= ap-target.bb b/meta/recipes-core/isar-bootstrap/isar-boots= trap-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 @@
> =C2=A0 Description =3D "Minimal target Debian root file syste= m"
> =C2=A0=20
> =C2=A0 WORKDIR =3D "${TMPDIR}/work/${DISTRO}-${DISTRO_AR= CH}/${PN}"
> -DEPLOY_ISAR_BOOTSTRAP =3D "${DEPLOY_DIR_IMAGE}/isar-boo= tstrap-${DISTRO}-${DISTRO_ARCH}"
> -ISAR_BOOTSTRAP_LOCK =3D "${DEPLOY_DIR_IMAGE}/isar-boots= trap-${DISTRO}-${DISTRO_ARCH}.lock"
> +DEPLOY_ISAR_BOOTSTRAP =3D "${DEPLOY_DIR}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}"
> +ISAR_BOOTSTRAP_LOCK =3D "${DEPLOY_DIR}/isar-bootstrap-$= {DISTRO}-${DISTRO_ARCH}.lock"
> =C2=A0=20
> =C2=A0 include isar-bootstrap.inc
> =C2=A0=20
> 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():
> =C2=A0=20
> =C2=A0=20
> =C2=A0 do_bootstrap[vardeps] +=3D "DISTRO_APT_PREMIRRORS"= ;
> -do_bootstrap[dirs] =3D "${DEPLOY_DIR_IMAGE}"
> +do_bootstrap[dirs] =3D "${DEPLOY_DIR}"
> =C2=A0=20
> =C2=A0 isar_bootstrap() {
> =C2=A0 =C2=A0 =C2=A0 IS_HOST=3D""
>=20
>=20
> Jan
>=20

...but we can also add "bootstrap/" to that path, to keep the= deploy dir cleaner.

Jan

--=20
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
------=_Part_3241_1589791836.1542791842453-- ------=_Part_3240_785476002.1542791842452--