[PATCH] initramfs: Fix detection of kernel image

[PATCH] initramfs: Fix detection of kernel image

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

This can also be vmlinuz-.... Broken like this when using the class for
x86 e.g.:

Log data follows:
| DEBUG: Executing python function sstate_task_prefunc
| DEBUG: Python function sstate_task_prefunc finished
| DEBUG: Executing shell function do_generate_initramfs
| update-initramfs: Generating /boot/initrd.img-vmlinux*
| W: No zstd in /usr/bin:/sbin:/bin, using gzip
| grep: /boot/config-vmlinux*: No such file or directory
| E: gzip compression (CONFIG_RD_GZIP) not supported by kernel
| update-initramfs: failed for /boot/initrd.img-vmlinux* with 1.
| WARNING: exit code 1 from a shell command.
ERROR: Task (/build/../work/recipes-initramfs/cip-core-initramfs/cip-core-initramfs.bb:do_generate_initramfs) failed with exit code '1'

Reported-by: Venkata Pyla <venkata.pyla@toshiba-tsip.com>
Fixes: 961a56828ca3 ("classes/initramfs: Print messages in case of a build error")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/initramfs.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/initramfs.bbclass b/meta/classes/initramfs.bbclass
index 817e97a3..925c3f6d 100644
--- a/meta/classes/initramfs.bbclass
+++ b/meta/classes/initramfs.bbclass
@@ -44,7 +44,7 @@ do_generate_initramfs() {
     fi
 
     sudo -E chroot "${INITRAMFS_ROOTFS}" sh -c '\
-        export kernel_version=$(basename /boot/vmlinux* | cut -d'-' -f2-); \
+        export kernel_version=$(basename /boot/vmlinu[xz]* | cut -d'-' -f2-); \
         if [ -n "$kernel_version" ]; then \
           update-initramfs -u -v -k "$kernel_version"; \
         else \
-- 
2.35.3

Re: [PATCH] initramfs: Fix detection of kernel image

[Uladzimir Bely]

On Tue, 2023-06-20 at 18:58 +0200, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This can also be vmlinuz-.... Broken like this when using the class
> for
> x86 e.g.:
> 
> Log data follows:
> > DEBUG: Executing python function sstate_task_prefunc
> > DEBUG: Python function sstate_task_prefunc finished
> > DEBUG: Executing shell function do_generate_initramfs
> > update-initramfs: Generating /boot/initrd.img-vmlinux*
> > W: No zstd in /usr/bin:/sbin:/bin, using gzip
> > grep: /boot/config-vmlinux*: No such file or directory
> > E: gzip compression (CONFIG_RD_GZIP) not supported by kernel
> > update-initramfs: failed for /boot/initrd.img-vmlinux* with 1.
> > WARNING: exit code 1 from a shell command.
> ERROR: Task (/build/../work/recipes-initramfs/cip-core-initramfs/cip-
> core-initramfs.bb:do_generate_initramfs) failed with exit code '1'
> 
> Reported-by: Venkata Pyla <venkata.pyla@toshiba-tsip.com>
> Fixes: 961a56828ca3 ("classes/initramfs: Print messages in case of a
> build error")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta/classes/initramfs.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to next, thanks.