From: Henning Schild <henning.schild@siemens.com>
To: <isar-users@googlegroups.com>, Baurzhan Ismagulov <ibr@radix50.net>
Cc: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
Subject: IMPORTANT Re: [PATCHv2] wic/plugins: fix kernel version detection for bios
Date: Thu, 4 Feb 2021 17:51:23 +0100 [thread overview]
Message-ID: <20210204175123.0ad2d16d@md1za8fc.ad001.siemens.net> (raw)
In-Reply-To: <20210204163912.31570-1-henning.schild@siemens.com>
Seems like a kernel update in buster found a bug in our wic plugin for
legacy bios. I would like to ask for a quick review of this, since it
currently breaks building bios wic images.
Henning
Am Thu, 4 Feb 2021 17:39:12 +0100
schrieb Henning Schild <henning.schild@siemens.com>:
> From: Henning Schild <henning.schild@siemens.com>
>
> The mechanism used to "cut off the end" seems to cut off too much.
>
> >>> "vmlinuz-4.19.0-14-amd64".strip('-' + 'amd64')
> 'vmlinuz-4.19.0-1'
>
> But indeed we would hope for 'vmlinuz-4.19.0-14'. This is a fix that
> should be aplied asap, it seems to affect all "even" kernel revisions,
> "odd" is odly enough no problem.
>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
> meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git
> a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py
> b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py index
> 493615b481..ece08efa76 100644 ---
> a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py +++
> b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py @@
> -135,7 +135,7 @@ class BootimgPcbiosIsarPlugin(SourcePlugin):
> kernel_name = get_bitbake_var("KERNEL_NAME") rootfs_dir =
> get_bitbake_var("IMAGE_ROOTFS") kernel =
> os.path.basename(os.path.realpath(os.path.join(rootfs_dir,
> kernel_file)))
> - kernel_version = kernel.strip('-' +
> kernel_name).strip(kernel_file + '-')
> + kernel_version =
> kernel[len(kernel_file)+1:-(len(kernel_name)+1)] initrd =
> "initrd.img-%s-%s" % (kernel_version, kernel_name)
> syslinux_conf += "KERNEL " + kernel + "\n"
> @@ -165,7 +165,7 @@ class BootimgPcbiosIsarPlugin(SourcePlugin):
> kernel_name = get_bitbake_var("KERNEL_NAME")
> rootfs_dir = rootfs_dir['ROOTFS_DIR']
> kernel =
> os.path.basename(os.path.realpath(os.path.join(rootfs_dir,
> kernel_file)))
> - kernel_version = kernel.strip('-' +
> kernel_name).strip(kernel_file + '-')
> + kernel_version =
> kernel[len(kernel_file)+1:-(len(kernel_name)+1)] initrd =
> "initrd.img-%s-%s" % (kernel_version, kernel_name) config =
> "config-%s-%s" % (kernel_version, kernel_name) mapfile =
> "System.map-%s-%s" % (kernel_version, kernel_name)
next prev parent reply other threads:[~2021-02-04 16:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-04 16:39 Henning Schild
2021-02-04 16:51 ` Henning Schild [this message]
2021-02-04 17:04 ` IMPORTANT " Baurzhan Ismagulov
2021-02-04 19:37 ` Henning Schild
2021-02-05 8:41 ` Baurzhan Ismagulov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210204175123.0ad2d16d@md1za8fc.ad001.siemens.net \
--to=henning.schild@siemens.com \
--cc=Vijaikumar_Kanagarajan@mentor.com \
--cc=ibr@radix50.net \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox