From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6925447760545054720 X-Received: by 2002:a17:906:560b:: with SMTP id f11mr9050381ejq.162.1612456459048; Thu, 04 Feb 2021 08:34:19 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:1432:: with SMTP id c18ls3580834edx.0.gmail; Thu, 04 Feb 2021 08:34:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJyn+tpQL2viwFYAd4EFZYiHKvMYgGVqQReNOWrrgkUpjf8l9u/tSdAQ/MsOj/97qFaiYSxF X-Received: by 2002:a05:6402:46:: with SMTP id f6mr8614818edu.163.1612456458084; Thu, 04 Feb 2021 08:34:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612456458; cv=none; d=google.com; s=arc-20160816; b=jXcsaZ6DOOabAmwrw0Jelv9AfAGhfCiD2XhzHbnjpNq1ToBiI+UiuBaoF1CVt18CfE 3nBqqw/EnsaW0iQ6y7kxUtrB2fCo3E0lrbFr8b2Bm6arJSuyfa7RHPRR6ywrO5ctFaEZ TApReJMzxtkO5yotxqKI2zeWiz/nbSa0V8aF1GVX8ZJKjB4TGyl2xWZ+ocqMkWIZxEuw ooI+TAS/3MuAz2M7oLe3VLFyqhcNExqYgmnu3DWdX2zRiD/r6wmqzOAJfdvxStNozXnq LPKahrMrlhJDCLQNjqdwlJHOsJ4lBCyw2ir5iOb0XSqiCJItYjgK61Y+8NuXAs9CKfR7 jAtQ== 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=DHKrcr7plBrcqvTQeWTkjSxlBW20Aj1S+GA0ZO9xhgo=; b=jxVulHUTfGrmZ/1NpRURBseUucD4VIgvsjRKQd54fwFiUqZlQ9zQMDxI41fL9ePj1Z bkIpIqKhqeigNcBSQ109IvMK/RRZeTR4E3hjYu8bm04IlImjupmMOr6a6E6SyonC+Zar nPLswKxs++AlkR+q970Dqmg88PjKat5XmS9drXrQ+0tjS80uU0hjpaayNZ8mw9+Ap53e CHovjsIxmc9k3wsmruMRBiFwhz+Vo4TNuS93f1J2qYMAHlghHXM/+nQOphRGcU/JyFX7 SvLq/sIfwpPRybr/1YJX2xbcumErCuco6Uoepy6Jz6kO4ulrpkANfjNqLy6Dn8fex0A+ Ez7A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id ce26si342705edb.2.2021.02.04.08.34.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Feb 2021 08:34:18 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 114GYHHT021091 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 4 Feb 2021 17:34:17 +0100 Received: from localhost.localdomain ([139.22.126.146]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 114GYHEc019702; Thu, 4 Feb 2021 17:34:17 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Henning Schild Subject: [PATCH] wic/plugins: fix kernel version detection for bios Date: Thu, 4 Feb 2021 17:34:13 +0100 Message-Id: <20210204163413.30668-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: LUeV537dk+j4 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..503c471cce 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" -- 2.26.2