diff mbox series

arm-bsp/firmware-image-juno: Fix deployment of compressed Image

Message ID 20230126193307.154631-1-daniel.diaz@linaro.org
State New
Headers show
Series arm-bsp/firmware-image-juno: Fix deployment of compressed Image | expand

Commit Message

Daniel Díaz Jan. 26, 2023, 7:33 p.m. UTC 
A recent commit compressed the kernel image (to Image.gz) and
by default enabled an initramfs image. In the case for when
such that (initramfs) is not desirable, the deploy step of the
Juno firmware will still try to install the Image file, (not
Image.gz), so this fails:

  ERROR: firmware-image-juno-1.0-r0 do_deploy: ExecutionError('/oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477', 1, None, None)
  ERROR: Logfile of failure stored in: /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/log.do_deploy.360477
  Log data follows:
  | DEBUG: Executing python function sstate_task_prefunc
  | DEBUG: Python function sstate_task_prefunc finished
  | DEBUG: Executing shell function do_deploy
  | cp: cannot stat '/oe/build/tmp-glibc/deploy/images/juno/Image': No such file or directory
  | WARNING: /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477:152 exit 1 from 'cp -L -f /oe/build/tmp-glibc/deploy/images/juno/Image /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/image/juno-firmware-19.06/SOFTWARE/'
  | WARNING: Backtrace (BB generated script):
  | 	#1: do_deploy, /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477, line 152
  | 	#2: main, /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477, line 163
  NOTE: recipe firmware-image-juno-1.0-r0: task do_deploy: Failed
  ERROR: Task (../meta-arm/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb:do_deploy) failed with exit code '1'

This updates the else case for when an initramfs image is not
in use so that the right kernel image is deployed, by using
the KERNEL_IMAGETYPE variable, to use either version of the
kernel image.

Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
---
Please backport to Kirkstone.

 meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jon Mason Jan. 27, 2023, 6:24 p.m. UTC | #1 
On Thu, 26 Jan 2023 13:33:07 -0600, Daniel Díaz wrote:
> A recent commit compressed the kernel image (to Image.gz) and
> by default enabled an initramfs image. In the case for when
> such that (initramfs) is not desirable, the deploy step of the
> Juno firmware will still try to install the Image file, (not
> Image.gz), so this fails:
> 
>   ERROR: firmware-image-juno-1.0-r0 do_deploy: ExecutionError('/oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477', 1, None, None)
>   ERROR: Logfile of failure stored in: /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/log.do_deploy.360477
>   Log data follows:
>   | DEBUG: Executing python function sstate_task_prefunc
>   | DEBUG: Python function sstate_task_prefunc finished
>   | DEBUG: Executing shell function do_deploy
>   | cp: cannot stat '/oe/build/tmp-glibc/deploy/images/juno/Image': No such file or directory
>   | WARNING: /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477:152 exit 1 from 'cp -L -f /oe/build/tmp-glibc/deploy/images/juno/Image /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/image/juno-firmware-19.06/SOFTWARE/'
>   | WARNING: Backtrace (BB generated script):
>   | 	#1: do_deploy, /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477, line 152
>   | 	#2: main, /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477, line 163
>   NOTE: recipe firmware-image-juno-1.0-r0: task do_deploy: Failed
>   ERROR: Task (../meta-arm/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb:do_deploy) failed with exit code '1'
> 
> [...]

Applied, thanks!

[1/1] arm-bsp/firmware-image-juno: Fix deployment of compressed Image
      commit: 99b769e6ce4ed722386883a01be6adb7ce18a622

Best regards,
Daniel Díaz Feb. 1, 2023, 3:25 p.m. UTC | #2 
Hello!

On Fri, 27 Jan 2023 at 12:25, Jon Mason <jdmason@kudzu.us> wrote:
>
> On Thu, 26 Jan 2023 13:33:07 -0600, Daniel Díaz wrote:
> > A recent commit compressed the kernel image (to Image.gz) and
> > by default enabled an initramfs image. In the case for when
> > such that (initramfs) is not desirable, the deploy step of the
> > Juno firmware will still try to install the Image file, (not
> > Image.gz), so this fails:
> >
> >   ERROR: firmware-image-juno-1.0-r0 do_deploy: ExecutionError('/oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477', 1, None, None)
> >   ERROR: Logfile of failure stored in: /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/log.do_deploy.360477
> >   Log data follows:
> >   | DEBUG: Executing python function sstate_task_prefunc
> >   | DEBUG: Python function sstate_task_prefunc finished
> >   | DEBUG: Executing shell function do_deploy
> >   | cp: cannot stat '/oe/build/tmp-glibc/deploy/images/juno/Image': No such file or directory
> >   | WARNING: /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477:152 exit 1 from 'cp -L -f /oe/build/tmp-glibc/deploy/images/juno/Image /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/image/juno-firmware-19.06/SOFTWARE/'
> >   | WARNING: Backtrace (BB generated script):
> >   |   #1: do_deploy, /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477, line 152
> >   |   #2: main, /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477, line 163
> >   NOTE: recipe firmware-image-juno-1.0-r0: task do_deploy: Failed
> >   ERROR: Task (../meta-arm/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb:do_deploy) failed with exit code '1'
> >
> > [...]
>
> Applied, thanks!
>
> [1/1] arm-bsp/firmware-image-juno: Fix deployment of compressed Image
>       commit: 99b769e6ce4ed722386883a01be6adb7ce18a622

Can this be backported to Kirkstone? That's where it broke our builds.

Thanks and greetings!

Daniel Díaz
daniel.diaz@linaro.org
Jon Mason Feb. 5, 2023, 9:59 a.m. UTC | #3 
On Thu, 26 Jan 2023 13:33:07 -0600, Daniel Díaz wrote:
> A recent commit compressed the kernel image (to Image.gz) and
> by default enabled an initramfs image. In the case for when
> such that (initramfs) is not desirable, the deploy step of the
> Juno firmware will still try to install the Image file, (not
> Image.gz), so this fails:
> 
>   ERROR: firmware-image-juno-1.0-r0 do_deploy: ExecutionError('/oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477', 1, None, None)
>   ERROR: Logfile of failure stored in: /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/log.do_deploy.360477
>   Log data follows:
>   | DEBUG: Executing python function sstate_task_prefunc
>   | DEBUG: Python function sstate_task_prefunc finished
>   | DEBUG: Executing shell function do_deploy
>   | cp: cannot stat '/oe/build/tmp-glibc/deploy/images/juno/Image': No such file or directory
>   | WARNING: /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477:152 exit 1 from 'cp -L -f /oe/build/tmp-glibc/deploy/images/juno/Image /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/image/juno-firmware-19.06/SOFTWARE/'
>   | WARNING: Backtrace (BB generated script):
>   | 	#1: do_deploy, /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477, line 152
>   | 	#2: main, /oe/build/tmp-glibc/work/juno-oe-linux/firmware-image-juno/1.0-r0/temp/run.do_deploy.360477, line 163
>   NOTE: recipe firmware-image-juno-1.0-r0: task do_deploy: Failed
>   ERROR: Task (../meta-arm/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb:do_deploy) failed with exit code '1'
> 
> [...]

Applied, thanks!

[1/1] arm-bsp/firmware-image-juno: Fix deployment of compressed Image
      commit: b004c61ec2306f3f4976e21c33cd846d9cd98c52

Best regards,
diff mbox series

Patch

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 473d28cc..45f2ec72 100644
--- a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb
+++ b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb
@@ -66,7 +66,7 @@  do_deploy() {
         cp -L -f ${DEPLOY_DIR_IMAGE}/Image.gz-initramfs-juno.bin \
             ${D}/${UNPACK_DIR}/SOFTWARE/Image
     else
-        cp -L -f ${DEPLOY_DIR_IMAGE}/Image ${D}/${UNPACK_DIR}/SOFTWARE/
+        cp -L -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ${D}/${UNPACK_DIR}/SOFTWARE/
     fi
 
     # Compress the files