All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [arm-bsp] firmware-image-juno: Fix dependency loop
@ 2020-05-01 13:15 Diego Sueiro
  2020-05-01 14:02 ` [meta-arm] " Bertrand Marquis
  0 siblings, 1 reply; 3+ messages in thread
From: Diego Sueiro @ 2020-05-01 13:15 UTC (permalink / raw)
  To: meta-arm; +Cc: nd

Kernel binaries copying have to be performed in the do_deploy task to
avoid dependency loop between firmware-image-juno do_install and
virtual/kernel do_deploy when INITRAMFS_IMAGE_BUNDLE is set.

Also, copy the kernel image bundled with initramfs to the firmware
image when INITRAMFS_IMAGE_BUNDLE is set.

Change-Id: I66083d294ab4eb77c643ec33cc1333000373125b
Issue-Id: SCM-987
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
---
 .../recipes-bsp/images/firmware-image-juno.bb      | 27 +++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb
index 9be4005..b0ad14f 100644
--- a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb
+++ b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb
@@ -29,6 +29,8 @@ inherit deploy nopackages
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
 
+# The ${D} is used as a temporary directory and we don't generate any
+# packages for this recipe.
 do_install() {
     cp -a ${WORKDIR}/${UNPACK_DIR} ${D}
     cp -f ${RECIPE_SYSROOT}/firmware/bl1-juno.bin \
@@ -37,13 +39,6 @@ do_install() {
     cp -f ${RECIPE_SYSROOT}/firmware/fip-juno.bin \
         ${D}/${UNPACK_DIR}/SOFTWARE/fip.bin
 
-    for f in ${KERNEL_DEVICETREE}; do
-        install -m 755 -c ${DEPLOY_DIR_IMAGE}/$(basename $f) \
-            ${D}/${UNPACK_DIR}/SOFTWARE/.
-    done
-
-    cp -L -f ${DEPLOY_DIR_IMAGE}/Image ${D}/${UNPACK_DIR}/SOFTWARE/
-
     # u-boot environment file
     cp -f ${WORKDIR}/uEnv.txt ${D}/${UNPACK_DIR}/SOFTWARE/
 
@@ -52,13 +47,29 @@ do_install() {
     cp -f ${WORKDIR}/images-r1.txt ${D}/${UNPACK_DIR}/SITE1/HBI0262C/images.txt
     cp -f ${WORKDIR}/images-r2.txt ${D}/${UNPACK_DIR}/SITE1/HBI0262D/images.txt
 }
-do_install[depends] += "virtual/kernel:do_deploy"
 
 do_deploy() {
+    # To avoid dependency loop between firmware-image-juno:do_install
+    # and virtual/kernel:do_deploy when INITRAMFS_IMAGE_BUNDLE = "1",
+    # we need to handle the kernel binaries copying in the do_deploy
+    # task.
+    for f in ${KERNEL_DEVICETREE}; do
+        install -m 755 -c ${DEPLOY_DIR_IMAGE}/$(basename $f) \
+            ${D}/${UNPACK_DIR}/SOFTWARE/.
+    done
+
+    if [ "${INITRAMFS_IMAGE_BUNDLE}" -eq 1 ]; then
+        cp -L -f ${DEPLOY_DIR_IMAGE}/Image-initramfs-juno.bin \
+            ${D}/${UNPACK_DIR}/SOFTWARE/Image
+    else
+        cp -L -f ${DEPLOY_DIR_IMAGE}/Image ${D}/${UNPACK_DIR}/SOFTWARE/
+    fi
+
     # Compress the files
     tar -C ${D}/${UNPACK_DIR} -zcvf ${WORKDIR}/${PN}.tar.gz ./
 
     # Deploy the compressed archive to the deploy folder
     install -D -p -m0644 ${WORKDIR}/${PN}.tar.gz ${DEPLOYDIR}/${PN}.tar.gz
 }
+do_deploy[depends] += "virtual/kernel:do_deploy"
 addtask deploy after do_install
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [meta-arm] [PATCH] [arm-bsp] firmware-image-juno: Fix dependency loop
  2020-05-01 13:15 [PATCH] [arm-bsp] firmware-image-juno: Fix dependency loop Diego Sueiro
@ 2020-05-01 14:02 ` Bertrand Marquis
  2020-05-06 16:01   ` Jon Mason
  0 siblings, 1 reply; 3+ messages in thread
From: Bertrand Marquis @ 2020-05-01 14:02 UTC (permalink / raw)
  To: meta-arm; +Cc: nd



> On 1 May 2020, at 14:15, Diego Sueiro via lists.yoctoproject.org <diego.sueiro=arm.com@lists.yoctoproject.org> wrote:
> 
> Kernel binaries copying have to be performed in the do_deploy task to
> avoid dependency loop between firmware-image-juno do_install and
> virtual/kernel do_deploy when INITRAMFS_IMAGE_BUNDLE is set.
> 
> Also, copy the kernel image bundled with initramfs to the firmware
> image when INITRAMFS_IMAGE_BUNDLE is set.
> 
> Change-Id: I66083d294ab4eb77c643ec33cc1333000373125b
> Issue-Id: SCM-987
> Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>

Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

> ---
> .../recipes-bsp/images/firmware-image-juno.bb      | 27 +++++++++++++++-------
> 1 file changed, 19 insertions(+), 8 deletions(-)
> 
> diff --git a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb
> index 9be4005..b0ad14f 100644
> --- a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb
> +++ b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb
> @@ -29,6 +29,8 @@ inherit deploy nopackages
> do_configure[noexec] = "1"
> do_compile[noexec] = "1"
> 
> +# The ${D} is used as a temporary directory and we don't generate any
> +# packages for this recipe.
> do_install() {
>     cp -a ${WORKDIR}/${UNPACK_DIR} ${D}
>     cp -f ${RECIPE_SYSROOT}/firmware/bl1-juno.bin \
> @@ -37,13 +39,6 @@ do_install() {
>     cp -f ${RECIPE_SYSROOT}/firmware/fip-juno.bin \
>         ${D}/${UNPACK_DIR}/SOFTWARE/fip.bin
> 
> -    for f in ${KERNEL_DEVICETREE}; do
> -        install -m 755 -c ${DEPLOY_DIR_IMAGE}/$(basename $f) \
> -            ${D}/${UNPACK_DIR}/SOFTWARE/.
> -    done
> -
> -    cp -L -f ${DEPLOY_DIR_IMAGE}/Image ${D}/${UNPACK_DIR}/SOFTWARE/
> -
>     # u-boot environment file
>     cp -f ${WORKDIR}/uEnv.txt ${D}/${UNPACK_DIR}/SOFTWARE/
> 
> @@ -52,13 +47,29 @@ do_install() {
>     cp -f ${WORKDIR}/images-r1.txt ${D}/${UNPACK_DIR}/SITE1/HBI0262C/images.txt
>     cp -f ${WORKDIR}/images-r2.txt ${D}/${UNPACK_DIR}/SITE1/HBI0262D/images.txt
> }
> -do_install[depends] += "virtual/kernel:do_deploy"
> 
> do_deploy() {
> +    # To avoid dependency loop between firmware-image-juno:do_install
> +    # and virtual/kernel:do_deploy when INITRAMFS_IMAGE_BUNDLE = "1",
> +    # we need to handle the kernel binaries copying in the do_deploy
> +    # task.
> +    for f in ${KERNEL_DEVICETREE}; do
> +        install -m 755 -c ${DEPLOY_DIR_IMAGE}/$(basename $f) \
> +            ${D}/${UNPACK_DIR}/SOFTWARE/.
> +    done
> +
> +    if [ "${INITRAMFS_IMAGE_BUNDLE}" -eq 1 ]; then
> +        cp -L -f ${DEPLOY_DIR_IMAGE}/Image-initramfs-juno.bin \
> +            ${D}/${UNPACK_DIR}/SOFTWARE/Image
> +    else
> +        cp -L -f ${DEPLOY_DIR_IMAGE}/Image ${D}/${UNPACK_DIR}/SOFTWARE/
> +    fi
> +
>     # Compress the files
>     tar -C ${D}/${UNPACK_DIR} -zcvf ${WORKDIR}/${PN}.tar.gz ./
> 
>     # Deploy the compressed archive to the deploy folder
>     install -D -p -m0644 ${WORKDIR}/${PN}.tar.gz ${DEPLOYDIR}/${PN}.tar.gz
> }
> +do_deploy[depends] += "virtual/kernel:do_deploy"
> addtask deploy after do_install
> -- 
> 2.7.4
> 
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [meta-arm] [PATCH] [arm-bsp] firmware-image-juno: Fix dependency loop
  2020-05-01 14:02 ` [meta-arm] " Bertrand Marquis
@ 2020-05-06 16:01   ` Jon Mason
  0 siblings, 0 replies; 3+ messages in thread
From: Jon Mason @ 2020-05-06 16:01 UTC (permalink / raw)
  To: meta-arm

On Fri, May 01, 2020 at 02:02:49PM +0000, Bertrand Marquis wrote:
> 
> 
> > On 1 May 2020, at 14:15, Diego Sueiro via lists.yoctoproject.org <diego.sueiro=arm.com@lists.yoctoproject.org> wrote:
> > 
> > Kernel binaries copying have to be performed in the do_deploy task to
> > avoid dependency loop between firmware-image-juno do_install and
> > virtual/kernel do_deploy when INITRAMFS_IMAGE_BUNDLE is set.
> > 
> > Also, copy the kernel image bundled with initramfs to the firmware
> > image when INITRAMFS_IMAGE_BUNDLE is set.
> > 
> > Change-Id: I66083d294ab4eb77c643ec33cc1333000373125b
> > Issue-Id: SCM-987
> > Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
> 
> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

Pulled into the master branch.

Thanks,
Jon

> 
> > ---
> > .../recipes-bsp/images/firmware-image-juno.bb      | 27 +++++++++++++++-------
> > 1 file changed, 19 insertions(+), 8 deletions(-)
> > 
> > diff --git a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb
> > index 9be4005..b0ad14f 100644
> > --- a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb
> > +++ b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb
> > @@ -29,6 +29,8 @@ inherit deploy nopackages
> > do_configure[noexec] = "1"
> > do_compile[noexec] = "1"
> > 
> > +# The ${D} is used as a temporary directory and we don't generate any
> > +# packages for this recipe.
> > do_install() {
> >     cp -a ${WORKDIR}/${UNPACK_DIR} ${D}
> >     cp -f ${RECIPE_SYSROOT}/firmware/bl1-juno.bin \
> > @@ -37,13 +39,6 @@ do_install() {
> >     cp -f ${RECIPE_SYSROOT}/firmware/fip-juno.bin \
> >         ${D}/${UNPACK_DIR}/SOFTWARE/fip.bin
> > 
> > -    for f in ${KERNEL_DEVICETREE}; do
> > -        install -m 755 -c ${DEPLOY_DIR_IMAGE}/$(basename $f) \
> > -            ${D}/${UNPACK_DIR}/SOFTWARE/.
> > -    done
> > -
> > -    cp -L -f ${DEPLOY_DIR_IMAGE}/Image ${D}/${UNPACK_DIR}/SOFTWARE/
> > -
> >     # u-boot environment file
> >     cp -f ${WORKDIR}/uEnv.txt ${D}/${UNPACK_DIR}/SOFTWARE/
> > 
> > @@ -52,13 +47,29 @@ do_install() {
> >     cp -f ${WORKDIR}/images-r1.txt ${D}/${UNPACK_DIR}/SITE1/HBI0262C/images.txt
> >     cp -f ${WORKDIR}/images-r2.txt ${D}/${UNPACK_DIR}/SITE1/HBI0262D/images.txt
> > }
> > -do_install[depends] += "virtual/kernel:do_deploy"
> > 
> > do_deploy() {
> > +    # To avoid dependency loop between firmware-image-juno:do_install
> > +    # and virtual/kernel:do_deploy when INITRAMFS_IMAGE_BUNDLE = "1",
> > +    # we need to handle the kernel binaries copying in the do_deploy
> > +    # task.
> > +    for f in ${KERNEL_DEVICETREE}; do
> > +        install -m 755 -c ${DEPLOY_DIR_IMAGE}/$(basename $f) \
> > +            ${D}/${UNPACK_DIR}/SOFTWARE/.
> > +    done
> > +
> > +    if [ "${INITRAMFS_IMAGE_BUNDLE}" -eq 1 ]; then
> > +        cp -L -f ${DEPLOY_DIR_IMAGE}/Image-initramfs-juno.bin \
> > +            ${D}/${UNPACK_DIR}/SOFTWARE/Image
> > +    else
> > +        cp -L -f ${DEPLOY_DIR_IMAGE}/Image ${D}/${UNPACK_DIR}/SOFTWARE/
> > +    fi
> > +
> >     # Compress the files
> >     tar -C ${D}/${UNPACK_DIR} -zcvf ${WORKDIR}/${PN}.tar.gz ./
> > 
> >     # Deploy the compressed archive to the deploy folder
> >     install -D -p -m0644 ${WORKDIR}/${PN}.tar.gz ${DEPLOYDIR}/${PN}.tar.gz
> > }
> > +do_deploy[depends] += "virtual/kernel:do_deploy"
> > addtask deploy after do_install
> > -- 
> > 2.7.4
> > 
> > 
> 

> 


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-06 16:01 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-01 13:15 [PATCH] [arm-bsp] firmware-image-juno: Fix dependency loop Diego Sueiro
2020-05-01 14:02 ` [meta-arm] " Bertrand Marquis
2020-05-06 16:01   ` Jon Mason

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.