From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6925447760545054720 X-Received: by 2002:a05:6512:3704:: with SMTP id z4mr2531408lfr.104.1612525699454; Fri, 05 Feb 2021 03:48:19 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3993:: with SMTP id j19ls2177855lfu.3.gmail; Fri, 05 Feb 2021 03:48:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzSDzTOXaohYiTh4TBodcQNFSc/tWQAJojdKLQGvcf/wk7IeDsLWfYnHSPLreSd8mXS0mMB X-Received: by 2002:ac2:5466:: with SMTP id e6mr2302071lfn.243.1612525698434; Fri, 05 Feb 2021 03:48:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612525698; cv=none; d=google.com; s=arc-20160816; b=JGNxjxFCYm4i1w7WSrzMcoTUxDqJ+oI7U9GTiF9FH8c43EYDLFUVoQKoNwsaJS+gWW vd1btgpGTd7KozhMVMMQEjTL6khcWhP/62r2JBQ5mK4aKJ/ZKEsGd3pkLgKi+Oiqqn0G DYtrwVb4FBA/QwKVAoqnrKxLj/DwHc1ObeHoCt5eROr+CcRh24d7JLb8pqKkL1xyFb79 gpUlxRvcY0L4JMFbzs1+fIP5lQIoT/d8w1V0pf60n876nq2w5+n5GfHLDiZFTH2EIQAA c8mMeXf0DMskEXSGbwqHiKZpOmThwm1Z4XlI12yUS8ta+9k5vMyfx+F/FpIfpBybFFnG WJ/g== 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=lEnTOoSidoqQpDh97ttpwJ2ism7qEFcvEXyEtIvdhKk=; b=zJ/Bgf+0r2+arNGWDWFZ3pCyiDbGbWN0VyK61sIXII8GywR29U4I2TdwGIfGeGv6Gf YpK4R6yEz49XLvKio7qjeZcUTZIcsu21Nplt6tzSppxxe+52nXM1jeYGPfPldJgNV9gj qKSBKdYJo2YDwjgf48xWINh/ZaarMV5SN3FgpaRI+3zG4wxFzCWgdZiWL0Bc6IgRsuAQ JoN2TGGmyZaBIGTsMwS5Q4xYozdS6DrBxywgI10rLhVzDCwY2XOIz43rJHliFgdYd7L1 pgbzNagcvSpAPCosBDFbdVV7b9furXb15h6NdvND/aRnjT7iTJRIF20cU29pty7N6nwP zNVQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id m17si264113lfg.0.2021.02.05.03.48.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Feb 2021 03:48:18 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 115BmHgf032113 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 Feb 2021 12:48:17 +0100 Received: from localhost.localdomain ([167.87.45.43]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 115BmHJf004348; Fri, 5 Feb 2021 12:48:17 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Henning Schild Subject: [PATCHv3] wic/plugins: fix kernel version detection for bios Date: Fri, 5 Feb 2021 12:48:12 +0100 Message-Id: <20210205114812.6370-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: WKLjSo/kjAhf From: Henning Schild When building an image with legacy bios using wic, wic can fail to pick up the initrd. ERROR: _exec_cmd: install -m 0644 /build/tmp/work/debian-buster-amd64/bla-image-qemux86-64-wic-img/0.2-r0/rootfs/boot/initrd.img-4.19.0-1-amd64 /tmp/tmp.7x9N9Wo4wZ/bla-image-debian-buster-qemux86-64.wic/tmp.wic.r10macew/hdd/boot/initrd.img-4.19.0-1-amd64 returned '1' instead of 0 output: install: cannot stat '/build/tmp/work/debian-buster-amd64/bla-image-qemux86-64-wic-img/0.2-r0/rootfs/boot/initrd.img-4.19.0-1-amd64': No such file or directory 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'. Seems that "even" revision numbers trigger the problem, while "odd" works. 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