From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6925447760545054720 X-Received: by 2002:a2e:988d:: with SMTP id b13mr174902ljj.176.1612457487972; Thu, 04 Feb 2021 08:51:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8952:: with SMTP id b18ls1166673ljk.3.gmail; Thu, 04 Feb 2021 08:51:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJxnGW4cnd5NK34OXRV+86jGqSQgxi8e/lZ69mm4IM8wDt7O924UJR0p3ixoAB6bbcd005xE X-Received: by 2002:a2e:965a:: with SMTP id z26mr174385ljh.342.1612457486941; Thu, 04 Feb 2021 08:51:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612457486; cv=none; d=google.com; s=arc-20160816; b=aePW7b76D7L2tXn32tUD0Yd9rdQE1dp7fYEJ72+f1VgUrsKsAj9/A0274zuJJqI9rr lATEKzCpEYdE2Ww98B3eJ2Sc6jO0yRC0TE1wMLbEGUCGExN4cYf4jK88J6r17oVM3Nkw /7mVZ4ynR5OGvKsl/uWTHRXMRbKWLFMclwU7nc6nIsaq5GzkEg20wrK0zDLupNJuo+Qu lsFcoHvzk01IoI+VEhFTvAMVdSlwgDCumdVwrj9QXrLniByxquV9gU+m+ktHMvEqMy12 yogb5jVkp7pLa+vlY/hW6T58TJi1T6KviChrfxkCwNL6apO6CAKojnUWJHltzMBkKaFz /xLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=VZvyYSex/uEjk9+81yok6jtH3rtfIvRGXPyIU5+aO68=; b=LxMhGMLYfbWXrizNyNHYwPOjb6vSo7G7oQtQXBiHJDB38+X8NUQwHe0SEWUA9garvE y1d49sOqlOKG5rl9nFC/RSiO66rqtos+9apMtBjFH6VVzclB1gBREtjJLkR33Q7z6uVv 9k4CwSfBEWu35+B+0P89iKDuOKkhLQoNjF+OZMB9vr3nT125lKg8tKdWCqjN9vANWubF gV6ylsKlB9+qx50chlrbAkEfXRwREocfQhS3cT85xLVu+g7KfDlGYKYvmI3865pkkKz/ 2e2U+CoUU67sJBMGmx6AtyxCNCdgr6p+NMdlBbEfyihtBuEvZMYDL37qphpxiVZJ+QJx 3FlQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id h12si302541lfp.7.2021.02.04.08.51.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Feb 2021 08:51:26 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 114GpP3A001125 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 4 Feb 2021 17:51:26 +0100 Received: from md1za8fc.ad001.siemens.net ([139.22.126.146]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 114GpPbm021372; Thu, 4 Feb 2021 17:51:25 +0100 Date: Thu, 4 Feb 2021 17:51:23 +0100 From: Henning Schild To: , Baurzhan Ismagulov Cc: Vijai Kumar K Subject: IMPORTANT Re: [PATCHv2] wic/plugins: fix kernel version detection for bios Message-ID: <20210204175123.0ad2d16d@md1za8fc.ad001.siemens.net> In-Reply-To: <20210204163912.31570-1-henning.schild@siemens.com> References: <20210204163912.31570-1-henning.schild@siemens.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: 74BSf47hCblK 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 : > From: Henning Schild > > 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 > --- > 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)