[meta-virtualization][PATCH] xen-rpi-u-boot-scr: WORKDIR -> UNPACKDIR transition

[meta-virtualization][PATCH] xen-rpi-u-boot-scr: WORKDIR -> UNPACKDIR transition

[tim.orling]

From: Tim Orling <tim.orling@konsulko.com>

Borrowed from Leon Anavi <leon.anavi@konsulko.com>
meta-raspberrypi: commit 434ed33c90b7659152b1e8d7c2d4d785db85105f

and from Martin Jansa <martin.jansa@gmail.com>
meta-raspberrypi: commit c39c2b165e68388767f54dc86acf4595a33ee1e1

This adapts to the oe-core rework to enforce a separate directory
for unpacking local sources (UNPACKDIR) instead of directly using
WORKDIR.

Follows the preliminary guideline from:
https://lists.openembedded.org/g/openembedded-architecture/message/2007

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 .../recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb
index 87619d01..3f83c7f8 100644
--- a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb
+++ b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb
@@ -17,13 +17,16 @@ do_compile() {
         -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \
         -e 's/@@RPI_DOM0_MEM@@/${RPI_DOM0_MEM}/' \
         -e 's/@@RPI_DEBUG_XEN_ARGS@@/${RPI_DEBUG_XEN_ARGS}/' \
-        "${WORKDIR}/boot.cmd.xen.in" > "${WORKDIR}/boot.cmd"
+        "${UNPACKDIR}/boot.cmd.xen.in" > "${WORKDIR}/boot.cmd"
 
     mkimage -A ${UBOOT_ARCH} -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr
 }
 
 inherit kernel-arch deploy nopackages
 
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
 do_deploy() {
     install -d ${DEPLOYDIR}
     install -m 0644 boot.scr ${DEPLOYDIR}
-- 
2.45.2

Re: [meta-virtualization][PATCH] xen-rpi-u-boot-scr: WORKDIR -> UNPACKDIR transition

[Bruce Ashfield]

merged to mater-next

I finally finished a week long battle with ceph, so I expect
to get master-next -> master this week.

Bruce

In message: [meta-virtualization][PATCH] xen-rpi-u-boot-scr: WORKDIR -> UNPACKDIR transition
on 20/07/2024 Tim Orling via lists.yoctoproject.org wrote:

> From: Tim Orling <tim.orling@konsulko.com>
> 
> Borrowed from Leon Anavi <leon.anavi@konsulko.com>
> meta-raspberrypi: commit 434ed33c90b7659152b1e8d7c2d4d785db85105f
> 
> and from Martin Jansa <martin.jansa@gmail.com>
> meta-raspberrypi: commit c39c2b165e68388767f54dc86acf4595a33ee1e1
> 
> This adapts to the oe-core rework to enforce a separate directory
> for unpacking local sources (UNPACKDIR) instead of directly using
> WORKDIR.
> 
> Follows the preliminary guideline from:
> https://lists.openembedded.org/g/openembedded-architecture/message/2007
> 
> Signed-off-by: Tim Orling <tim.orling@konsulko.com>
> ---
>  .../recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb     | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb
> index 87619d01..3f83c7f8 100644
> --- a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb
> +++ b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb
> @@ -17,13 +17,16 @@ do_compile() {
>          -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \
>          -e 's/@@RPI_DOM0_MEM@@/${RPI_DOM0_MEM}/' \
>          -e 's/@@RPI_DEBUG_XEN_ARGS@@/${RPI_DEBUG_XEN_ARGS}/' \
> -        "${WORKDIR}/boot.cmd.xen.in" > "${WORKDIR}/boot.cmd"
> +        "${UNPACKDIR}/boot.cmd.xen.in" > "${WORKDIR}/boot.cmd"
>  
>      mkimage -A ${UBOOT_ARCH} -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr
>  }
>  
>  inherit kernel-arch deploy nopackages
>  
> +S = "${WORKDIR}/sources"
> +UNPACKDIR = "${S}"
> +
>  do_deploy() {
>      install -d ${DEPLOYDIR}
>      install -m 0644 boot.scr ${DEPLOYDIR}
> -- 
> 2.45.2
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8837): https://lists.yoctoproject.org/g/meta-virtualization/message/8837
> Mute This Topic: https://lists.yoctoproject.org/mt/107463785/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

Re: [meta-virtualization][PATCH] xen-rpi-u-boot-scr: WORKDIR -> UNPACKDIR transition

[Tim Orling]

[-- Attachment #1: Type: text/plain, Size: 3081 bytes --]

On Mon, Jul 22, 2024 at 3:17 PM Bruce Ashfield via lists.yoctoproject.org
<bruce.ashfield=gmail.com@lists.yoctoproject.org> wrote:

>
> merged to mater-next
>
> I finally finished a week long battle with ceph, so I expect
> to get master-next -> master this week.
>

I finally got my yp-dev-day_virtualization CI up and sort of running again
(which is how I caught this):
https://gitlab.com/moto-timo/yp-dev-day_virtualization/-/pipelines

Onward and upwards!


>
> Bruce
>
> In message: [meta-virtualization][PATCH] xen-rpi-u-boot-scr: WORKDIR ->
> UNPACKDIR transition
> on 20/07/2024 Tim Orling via lists.yoctoproject.org wrote:
>
> > From: Tim Orling <tim.orling@konsulko.com>
> >
> > Borrowed from Leon Anavi <leon.anavi@konsulko.com>
> > meta-raspberrypi: commit 434ed33c90b7659152b1e8d7c2d4d785db85105f
> >
> > and from Martin Jansa <martin.jansa@gmail.com>
> > meta-raspberrypi: commit c39c2b165e68388767f54dc86acf4595a33ee1e1
> >
> > This adapts to the oe-core rework to enforce a separate directory
> > for unpacking local sources (UNPACKDIR) instead of directly using
> > WORKDIR.
> >
> > Follows the preliminary guideline from:
> > https://lists.openembedded.org/g/openembedded-architecture/message/2007
> >
> > Signed-off-by: Tim Orling <tim.orling@konsulko.com>
> > ---
> >  .../recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb     | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/
> xen-rpi-u-boot-scr.bb
> b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/
> xen-rpi-u-boot-scr.bb
> > index 87619d01..3f83c7f8 100644
> > --- a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/
> xen-rpi-u-boot-scr.bb
> > +++ b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/
> xen-rpi-u-boot-scr.bb
> > @@ -17,13 +17,16 @@ do_compile() {
> >          -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \
> >          -e 's/@@RPI_DOM0_MEM@@/${RPI_DOM0_MEM}/' \
> >          -e 's/@@RPI_DEBUG_XEN_ARGS@@/${RPI_DEBUG_XEN_ARGS}/' \
> > -        "${WORKDIR}/boot.cmd.xen.in" > "${WORKDIR}/boot.cmd"
> > +        "${UNPACKDIR}/boot.cmd.xen.in" > "${WORKDIR}/boot.cmd"
> >
> >      mkimage -A ${UBOOT_ARCH} -T script -C none -n "Boot script" -d
> "${WORKDIR}/boot.cmd" boot.scr
> >  }
> >
> >  inherit kernel-arch deploy nopackages
> >
> > +S = "${WORKDIR}/sources"
> > +UNPACKDIR = "${S}"
> > +
> >  do_deploy() {
> >      install -d ${DEPLOYDIR}
> >      install -m 0644 boot.scr ${DEPLOYDIR}
> > --
> > 2.45.2
> >
>
> >
> >
> >
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8838):
> https://lists.yoctoproject.org/g/meta-virtualization/message/8838
> Mute This Topic: https://lists.yoctoproject.org/mt/107463785/924729
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [
> ticotimo@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 5592 bytes --]