From patchwork Fri Feb 5 01:48:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 303 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:3788:0:0:0:0:0 with SMTP id r130csp2128639oor; Fri, 5 Feb 2021 03:48:20 -0800 (PST) X-Received: by 2002:a2e:a492:: with SMTP id h18mr2504016lji.66.1612525699887; Fri, 05 Feb 2021 03:48:19 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1612525699; cv=pass; d=google.com; s=arc-20160816; b=fAGh9OfD8QWd13y8Ed6OsgC7EhCNF4CgmKTQkwavo+sCEL3J76DPZ5cYzX1HvVFyge r11+vIHgCzOVkAPBt+j0vTktDgSM0XGNTr0iV49f+F2Ecr2a+RUkjpPO4oq5RM/Nq6DC /XBw2fgceqEfH6aNaEgOvoNgfL5BuSqZYkVnRn5g0s2YfHQwmzXTD8YxBWdSGbFDLrA2 gKfUZsc//m4uo0XFYTNScOg0uxWpqz6XAeUAhU2znZHWICSBoxjoW5KjBvABtcp80oqp A5TvWu/I4hpYsfuDL1liYnI+rj4u0y2ACXt3ZrOUQAyptasK5BPEyCRro2WyU09Vo1dw KPcg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=X2ShBr8iOxdDb9jFCcdfbeAl3MeWBagoIJeVwso4ivk=; b=sGPjInJJsPrRVo3iEJghFMZ6m23wQ3WCn0n6+i1N2QVZia1osCCmxP+aizUxEBFhds DcDaq6d6kvDzPkn2bIHW8Ac2PgeZyHFlbQu2a/jd+qwq2Qfl/s3SVCPAvU4vKzAq6WUp RKV1KNjPGy5MluVOYPU0uaTgXXHmHL0SvvFTmVgooO9Sbd2QJusrBuTYi93pdisR92B+ 7RObwlNkBc+3Pz61LmQk8Rj0QjpXjpUHKy3oSWYfqDwFsNA0309UwbdzmX9qwDD/bgDN 5/0DWE6lxxSLcuu1F2yZYJPPfShdovoPg0/XIcQNz5h5a5lRkzmcCfDuoQ15Tp2gwUp3 S+Nw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=QIgDOoXJ; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrba7b6saamgqee4a5udy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBA7B6SAAMGQEE4A5UDY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id w10sor4057148ljj.50.2021.02.05.03.48.19 (Google Transport Security); Fri, 05 Feb 2021 03:48:19 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbdjmjpgy2mgrba7b6saamgqee4a5udy@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=QIgDOoXJ; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrba7b6saamgqee4a5udy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBA7B6SAAMGQEE4A5UDY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1612525699; cv=pass; d=google.com; s=arc-20160816; b=vG3OQg0zV561FJy4HTawpUPtCghr2fpdlKRUnH9qr2czq8NsEAxccrAqVyevH5nzRq NAvoA2jaqRvxBqMaeShvQdUkQa3yLH47IDYQ4bL/3sHBp1/lx1JL6dXT0yLhj/769Zty ES1K15HNmKcOGjcUQLqzWrbXUEuqCS+M1/NvH6pgCWBEA8fw/2q6ECGN1kmXFOW4CmAz Y65qJ7xaZI7P1ousSNS70e7ol0LCI9GMGrRftnZmQSXx9ZGVwR24JLq4W9D1/wbgUiwE vdSKng1De/axzIHkoTzvrxRypDinwL1D9ULb8mejXmOhkGKC3XGX/QGi8mOxLU52xllU 5s+Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=X2ShBr8iOxdDb9jFCcdfbeAl3MeWBagoIJeVwso4ivk=; b=NfRxUvkjracfqMav5lJWKY14u0Ljd9oUnEWOhHJhYPu23nn4xRuYu4A/DFBSNdy8NF 9p9ImzkG5/gI/fofF0JRXHPF2zsjMKDSKT+X0GidytdpcV7f1Qv1XIn1YUso2FxIXdvJ VYNr9eISmj78XBhPfQd/bK6ur4fRBUw8MaL6jFW3EBLe1ahwYSfRUngMXQRvSjtF/hdY o4fzeFgI7Kw+ANHKFhzl1tWxXffvQAn6fVpxj/hY6BQWGpXYoToqtGN3GAtcsB4palFm mjGcSRYUAXPGNu477Oiwx7Y4uv0QVEvjsD6PMYjBPDJrLoAypTdlzFLjAJzDrwbvbD+Y oOGg== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=X2ShBr8iOxdDb9jFCcdfbeAl3MeWBagoIJeVwso4ivk=; b=QIgDOoXJGDsDg+bb9qJcU26WcFp23S3C7nByEpKJv45U9uDkLNhGy8RavhwbHB2FBA VNRyr3R3GJX34JhhDnswVYUZ9NZGhGBPgMt+3mLbDNh2BSS4xx2C14oqhbj0pnEGr80T OHNAIcugxGz0uMdNALAGir/PWnWGV2nHnffM9wP7QfZqv/oJ4E8uuMDSmOQJCCV6tmTN 4diMqFnsmkh/JgNA8LqyMJeHxAFMt8l5rZRUwVcD40qActUhf+zBi/anISNETX2ogIDD elj8MOd3EcCt+zNlH74lRgWB5ACAFL7lztQoVRGXrvHWMAmJA1Xj8/sQp32qJmz0UIPm vRMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=X2ShBr8iOxdDb9jFCcdfbeAl3MeWBagoIJeVwso4ivk=; b=gbefFPk4dKRo03oCJ7oLASs5JsPoeDlZydRx91IgOshWwq4JGNoeI1B/NtSwmIRC2s glZFcGSbXqJqz0LQM1vJuXj/Tc7S7877oa6kyuMPHDkxvBhZaZgFzu+VhLgMFG3bVUtC XVlEWT2nLs/XCg3quFYkbb9B22sHawtNe081NJIfEkQyCGRWlXq7P2FckLkYKNhrxfgk Kx+Z1MXBsHVRA7SZLOTCjCiH6I9wFgyLfL2UmF68YMqSIFqBl+UsG5Aqd1VjhGhtv3Y9 qlErp/OMFL0OiLoN4C9r3TQfMjxAxIdxaPkUX9s/7YEtoGAviUTV+rUroDAwb4ANjtCd dibQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533nonSutJJ4muFJZpyIKBrsDV8F58yz9WbIsKfFFrcHTBcy+osX TuslJWxsPxZslZQAq34nmeg= X-Google-Smtp-Source: ABdhPJz8hKm8pyF10S9sIuqHfIjjavYqTyjU2s3djBOfSvh6ZAT57shI/d4cquIf2+Inehx4zAHBoA== X-Received: by 2002:a2e:960d:: with SMTP id v13mr2439630ljh.370.1612525699376; 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-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 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; 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 X-Original-Sender: henning.schild@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1690855748222253680?= X-GMAIL-MSGID: =?utf-8?q?1690855748222253680?= 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 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)