From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6925447760545054720 X-Received: by 2002:a1c:d7:: with SMTP id 206mr62507wma.68.1612456757500; Thu, 04 Feb 2021 08:39:17 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fd09:: with SMTP id e9ls788343wrr.0.gmail; Thu, 04 Feb 2021 08:39:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJww0cl/CcjYF1vaRQfxoWKYOCq51pCgXC45+3V/xNBLDo+xDBSdz3an8zC3YUbT8Nd2uvpa X-Received: by 2002:adf:dd05:: with SMTP id a5mr192886wrm.402.1612456756689; Thu, 04 Feb 2021 08:39:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612456756; cv=none; d=google.com; s=arc-20160816; b=rtwPdaOYAtOIdUgfWjBrbjsgioWGgI3jVqgQS3tWqs9pwW4Tn3QX0GZnmQi1Wr6PcY +LA9JxWvOVxu8o483NqzSr30Cy4AbYYRlhl8EROdoAkrfNEIRURf9dXrOsnavTQZw6/e YISfAPvB8kiGn7C2Nkk7HLkJb667gGlICOIus1RSaqbLn7MLzaS8lOVMQo2IiuuA223C wFGQI+unLWR2+BBlmKxdA5i3W9wkbU2p+fAs9eiwcM1D+OZWQkJMhnkB7WbzZgv97D2W FAu+htCZUVgyaOgofpm5ZbG7zv3WamOjTm0zKHN02rqVBgGFG2DyEnenwmXapwtYlwNf bqjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=2W9fmX0AwvdYmADqrea91kQE9bCVORJ69l32UguXg54=; b=nIiWCL5WSiwvNVz7lDVyim70QCytecif7qUnzomultpgfijMaTOGJy+xA/5i4tyVCl s/ALeFTS0gt4i2ewmUyOUMMf+4s2f+2V8zUuqGGRdyyClwxin5hBkjORQh9xPNnf2hOB mdiSut0yvmNG8iHpP666+lw23dcXBDf8yyuuv3GMVNsznE4r0doPAu6GTaJUjUA9WeK8 lBNIGoMPWSQx4DmcQpmlGax0aYv/mWBD/e0fPTlImk9SOjfOyQ8yNDwZTD7WJIBdlbLf aIN1Ib/9rQDfyApd72zrEaHPcRZVC85KYQEZ8Xg3HRUBVz8+Do0P4ttmi9JmsKp+O8IZ A5ig== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id t16si825385wmi.3.2021.02.04.08.39.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Feb 2021 08:39:16 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 114GdG8d016275 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 4 Feb 2021 17:39:16 +0100 Received: from localhost.localdomain ([139.22.126.146]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 114GdFB2008886; Thu, 4 Feb 2021 17:39:15 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Henning Schild Subject: [PATCHv2] wic/plugins: fix kernel version detection for bios Date: Thu, 4 Feb 2021 17:39:12 +0100 Message-Id: <20210204163912.31570-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: fnSiLuzES2hI 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) -- 2.26.2