From patchwork Fri Jan 10 20:30:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "peter.czegledy" X-Patchwork-Id: 4002 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 10 Jan 2025 21:31:03 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f60.google.com (mail-lf1-f60.google.com [209.85.167.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 50AKV1NJ003366 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 10 Jan 2025 21:31:01 +0100 Received: by mail-lf1-f60.google.com with SMTP id 2adb3069b0e04-54278fd4534sf1879391e87.1 for ; Fri, 10 Jan 2025 12:31:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1736541055; cv=pass; d=google.com; s=arc-20240605; b=TV6KsihgwqtILtOAOIRV4pYRBlQosv1bc3reApej1HgJ8p14uHSHGinq3maUyUEXzN p9mys7Grw2hVN4Neube+l+gIEaA66WsIAhNmpgbQQrQfeZHYBWK1A7y5YOLyCAnlUasT wW8aH8pnMSi/j0TRHRpEmIG6F41Wt966wfBsRcvgshIbvyvKzzIMs7FsaVKlayzGV4/U yJbWg+2hGw/cvUsr9PcUdR71/TuzphNvwefU1ck6MxHMsSzx+biTyMTLdjlMIv79WKB9 UZ4FL/jaL/lRi39I0T4mCgxRdeV/4n8SACOe2Uup/OGhHulcIk/89l+V75nVdLLd7Mgi BxwA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3Bw5Q64eYNO4eW0fjani5K18jZBd5RFV0A+ymdzL47k=; fh=ZBS/hV8204h0wEifAb3f5b5/0Ho2XsbixiUqt3YClSA=; b=Yi19kFAwlupZaFe7H71+ATnly+IfLbFN955iQV0a/tAF4WHHub8etMaibJppSsfHbQ mw23Bs6AKvyZliWtq2OzpRsBY16LsVDSWJNmUP7AGXovEVyRfhtk2lMxuaMlXGR8CnbY ulQrJBnf+eALYyTsmgLd90yilxI3NmTMYP0yhi+MX3/VF2nptSc/4Ys9sVXZYi8C9tLB u15orI3rDhskrdIQa9SKWADn/Ntr9cEAtYdbn9M7kqXNJkutrJ42Hx9Jc62FqnHqphu7 2+BhZ49k+hrGLXTRSA5arigbgBm0CI00OAo4URKGaoh2+nAPFQoVcjPl6l+PSmQZ8OIE 2pcA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@evosoft.com header.s=fm1 header.b=RLefNoWY; spf=pass (google.com: domain of fm-1328579-20250110203051034023e702217b331e-0o2pff@rts-flowmailer.evosoft.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328579-20250110203051034023e702217b331e-0o2pFF@rts-flowmailer.evosoft.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=evosoft.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1736541055; x=1737145855; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=3Bw5Q64eYNO4eW0fjani5K18jZBd5RFV0A+ymdzL47k=; b=XmvVGzh+LlPniwFTONqwUaBuiyUuY6pKeK57RRlSQlK3FXabo93lnPC2slAEui7jc8 iSZ4CSyurJ2LnJy1VHbsZ6d5Du78wNUl8p24qq70QxTxDG9De9mn9wqs7Ekes/bjsPYN MSj/nIDJ02iWN6k+GtSoF/Gd1zqWPVm/fVJl36IZPilCrNyvQzK7HtDM7sMxt5q4+io1 ZFjmDr/cd6kL9cxsQYVY2ym6TPJ7wnrYrSyss28KHqqIpzOLDodU046alCAbd/a9372s VydE0rjiQo3WPieaUv6G9J5njk+qHp6REyXQlcCgRoA9gm2DT+cDGtH5B0r1GyGGtVIS CZWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736541055; x=1737145855; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3Bw5Q64eYNO4eW0fjani5K18jZBd5RFV0A+ymdzL47k=; b=HnHGIXsVio6mx7R4gmsJO5bxx5PwOOwEkJKK7ikEYxOD0CXeIRG2Y5YqGoNC22bmQv nULIqPTo8Ws3AUXVw2rApqmMf9es3y7/3rUCouWZz31m7U5IV38LGKf2aTX2LyUjHZa/ LLXucVQDYLvP8knCZgyd3/J/v3p/2KAq1bl4zgV8I2n23TmBD2nFvAet08nbjaVLDsk6 v1MEc+pT81xnl+THvb+AdvUygIB7sIC9r8r0LWo04c47jy1twfi0S4KRePq0qapm1o7X alXfIMpIkog267uobM7Wwv/ohyNHVzEgisNfbbzdEFp7sISoUfsg/REStWkpgiuDGWKV QEpQ== X-Forwarded-Encrypted: i=2; AJvYcCXMtHltX9ivie+ed5RPJYJYAyp/kyC+X+gCWdXZKZ4tUjnPym/lum43vviQcrgxZUn6DZfXLo4=@isar-build.org X-Gm-Message-State: AOJu0YzuPFpOvRgBx7ETf44pnv+Ei4XRk0Q7BR7BGY1+ks4b3ifOO1/u 1rN9CSmgkBGmOWfyqwkdU/ltwfeLeGKByZEpA+0QS6CKcp9jyLf6 X-Google-Smtp-Source: AGHT+IFGfr8gqkEfhuoMI4wGUdwh3YOdvMnJ4MNFtVeSJhV+tdJSAT6os4pR2fgzGpvVMGuFPvkrZg== X-Received: by 2002:a05:6512:401b:b0:540:20eb:80c5 with SMTP id 2adb3069b0e04-542848166b8mr4033498e87.37.1736541054747; Fri, 10 Jan 2025 12:30:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:8c44:0:b0:541:3532:a814 with SMTP id 2adb3069b0e04-5428a209f48ls231612e87.2.-pod-prod-07-eu; Fri, 10 Jan 2025 12:30:52 -0800 (PST) X-Received: by 2002:a05:6512:138e:b0:541:cdef:7ca3 with SMTP id 2adb3069b0e04-542845c47a0mr3814769e87.27.1736541052470; Fri, 10 Jan 2025 12:30:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736541052; cv=none; d=google.com; s=arc-20240605; b=JVmfU79uHFe3+FKiOQDgxbXIzSPr5/nYkEaYwmAuTcXhUpAb6XlT8aHa1QB2wnM1rN Q/q05r/VXiwAGTarvumcL2o6+LXKgToZlZo+IsI/8F27jVqVvY2odMK59je8VgJxfvpe Mis+v8yR3P8qb3c3HCpw2GymIG3JRLoUXii9lNUDyZy+cyoL7AywJHdJds5IGvAU0iE2 yxBcaik+wNE7y4Y3aHDd1QdhIzYmLjb6kJ1aWMGRcXXCJv65QRA35nMnGr+ciqCDiVXy mIX8O5y7QChJt3CWTmBPajibcna2LL7TFG9LAFWEoI5h9CK8u6zp2pb0dMtSVTQbUvxF MQ4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=k2oBQtKawbuvBLt3YPt3dDUXZz7cAweona4V7TkVDAM=; fh=Rk0F5Qxc87u/JqZvZ4UC1jZks03skR1bVck+OsPMLZw=; b=iQ2KCHGi5QCE/y50Kuf2Fez8r9hPjY5dsKtkub23s0YXkkrSqY+daLobxLc6DYQoeS SoUQV1lvb8C9GnnBH5Q1PD49LZR/NJK+wPL8eqs651E8VBTw4yHTz/nkWkSawAdwEVBk blCNsQfz9CxkMyIUzXDsT3GBe0vPy+6MyEn355s4trqbAMUnCLw5FNmjt6jw9GyT9ekb G2jqhFbOk49dqTrnsKz33CyjzBU10NqlLh+4OuZp28G40uDKbGWjmyTrGQ0uYwziGPr7 /V9DY9cDGnfOX9mWhqgVghYHDk0ZzUGFHjJtbtWmWltaSfdA9A/6qozQZCk0az/KnWgx 6K4A==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@evosoft.com header.s=fm1 header.b=RLefNoWY; spf=pass (google.com: domain of fm-1328579-20250110203051034023e702217b331e-0o2pff@rts-flowmailer.evosoft.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328579-20250110203051034023e702217b331e-0o2pFF@rts-flowmailer.evosoft.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=evosoft.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-5428c7bf683si122164e87.3.2025.01.10.12.30.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jan 2025 12:30:52 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1328579-20250110203051034023e702217b331e-0o2pff@rts-flowmailer.evosoft.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20250110203051034023e702217b331e for ; Fri, 10 Jan 2025 21:30:51 +0100 X-Patchwork-Original-From: "peter.czegledy via isar-users" From: "peter.czegledy" To: isar-users@googlegroups.com Cc: Peter Czegledy Subject: [PATCH v2] wic: bootimg-efi-isar: fix generating of grub.cfg for custom initrd Date: Fri, 10 Jan 2025 21:30:41 +0100 Message-Id: <20250110203041.662979-1-peter.czegledy@evosoft.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1328579:519-21489:flowmailer X-Original-Sender: peter.czegledy@evosoft.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@evosoft.com header.s=fm1 header.b=RLefNoWY; spf=pass (google.com: domain of fm-1328579-20250110203051034023e702217b331e-0o2pff@rts-flowmailer.evosoft.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328579-20250110203051034023e702217b331e-0o2pFF@rts-flowmailer.evosoft.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=evosoft.com X-Original-From: peter.czegledy@evosoft.com Reply-To: peter.czegledy@evosoft.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-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Peter Czegledy Specifying the initrd location via WICs sourceparams initrd argument doesn't generate the initrd location properly in case of grub-efi loader. This fixes that and unifies the custom initrd handling for grub-efi and systemd-boots. Signed-off-by: Peter Czegledy --- .../lib/wic/plugins/source/bootimg-efi-isar.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index 50f4187d..78ae4fb2 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -108,9 +108,12 @@ class BootimgEFIPlugin(SourcePlugin): if label: label_conf = "LABEL=%s" % label - kernel, initrd = isar_get_filenames( + kernel, default_initrd = isar_get_filenames( get_bitbake_var("IMAGE_ROOTFS"), get_bitbake_var("KERNEL_FILE") ) + if not initrd: + initrd = default_initrd + grubefi_conf += "linux /%s %s rootwait %s\n" \ % (kernel, label_conf, bootloader.append) @@ -187,12 +190,11 @@ class BootimgEFIPlugin(SourcePlugin): title = source_params.get('title') - temp_initrd = initrd - kernel, initrd = isar_get_filenames( + kernel, default_initrd = isar_get_filenames( get_bitbake_var("IMAGE_ROOTFS"), get_bitbake_var("KERNEL_FILE") ) - if temp_initrd: - initrd = temp_initrd + if not initrd: + initrd = default_initrd boot_conf = "" boot_conf += "title %s\n" % (title if title else "boot")