From patchwork Fri Jan 10 11:50:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "peter.czegledy" X-Patchwork-Id: 4001 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 13:10:59 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f192.google.com (mail-qt1-f192.google.com [209.85.160.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 50ACAwtl001321 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 10 Jan 2025 13:10:59 +0100 Received: by mail-qt1-f192.google.com with SMTP id d75a77b69052e-4679db55860sf35065361cf.3 for ; Fri, 10 Jan 2025 04:10:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1736511052; cv=pass; d=google.com; s=arc-20240605; b=NIICUxV5TnNfuXURXahUzrVKbRad2j3yJwL06rAWBGsDc8tGent2/2igEIL5Pykalg 8AKqEsidXbiT5W/kzRTpD178Ev8RIWHLucdCLw/emeM1GiKgsVKofscFNQ8vzEavcLaP cKtl9HVnCHh8pm80DcGKq3RtZlt1YRgLMQy89ZEzCRd6g+xiYOnhCf9/bZBfqWR7uOOX SE9Lbd+jF6EwgJ8bTx8PXR5F2pRoe8sqEPMi1zLtxVl1QfgWHyyrb+vfDeuPvW5ez/ua L7eOaE26w2ithgTQJ9S4UR8b4Ptq3M3Bn2T1eCnGt2OdVhzCeb9SNIAUmKVWWMvEESU4 fi4g== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=1jEsKADBJHqt2egR3AwW4RAgFgPnzMR21S21JHo4iFg=; fh=NkbfKr4vrKLu6bptQs+S7pkfuV720/Y/SVYqN8Y/CYs=; b=Fd9ryVF6gxWBb0+5wJdHKcVXia/wuNfp85sRCu0zBGNblp3updRcpyaOLaoQQEriep /JDiMLjLN72lPBN0HlOfQvU8cwkoR/ax52gl+nxjksn5gMrpRkufMAur3BqolPhpu7eW /XWTlY8aOBh60U9IkaV1nrvRhzdln3FwPqK4sA6L1nJeeSzbT6Qqtg2PGPMu9Zjkrhtj uNEh9wrq6EppojkcTA68tzvzmfe6Ng2FVavY0NeWT2jXswc58U6HCq2P2TpdQETgb6y/ DmzHMLjA9OpJ/fzFUa/xc9zdWY/vwIi/eYyyja/DrV9kIeLlVMxuqWRSWrNANBumSMOX +InA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@evosoft.com header.s=fm1 header.b=WudMA0R+; spf=pass (google.com: domain of fm-1328579-20250110115052e047bedde0b41274c6-ipfnz0@rts-flowmailer.evosoft.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1328579-20250110115052e047bedde0b41274c6-IPfNZ0@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=1736511052; x=1737115852; 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:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=1jEsKADBJHqt2egR3AwW4RAgFgPnzMR21S21JHo4iFg=; b=ZMeMJOGSr5sU5rLWG+E+KYbuTLV2wpde8/O15q9IJWSvUJK9vh0MO+4tpLcwfY/kOq 0xPA5bdAQ2KM/2VSG7XtWsb4vRxUiApjioKAQUcJXgeEw6+VemEMHq9APvEw0gmt/zyD dyDE+MpJvnOd8HHkFMB/Xp+BEqp/JHAKi+3XeWidKwuxYdHZLc7aOeD3NHXXK1jnJtJf CwJ68tnJjoXnCb+H/3zs5/KLi0oAs+aqVMEETN5rGGsk6DPfMsToYCKTSxyAU7+lu17w EW7mj6GClqotNJGEKk6drP6qBv3Qi5ovgig+SoWs0nUrjGCbTRB09DdclXhrb2E35GpF DBdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736511052; x=1737115852; 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:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1jEsKADBJHqt2egR3AwW4RAgFgPnzMR21S21JHo4iFg=; b=AjLkYBXe+MeFlu/JYoEajn62I8YRhMDEcgpGZBQaLLF6KQgVnWW75EhaSyLAmiJIMi LsWJtI8tok2l3mCiT1iffw37x36s/8FKXm0nyEaGLCWjMH2yZdw8nDe8G2zfEKgnuN2m 8fMqNRk62/CxPs3/ki7RmFuNRBd+t5OdNfYDRdYV8Apn7lAwKdSg4OqXh6q2hNTnmgpc /i2JPlkst+8CNE9Fe4na/R/hg8TwUtoW0nADL3UqFu+Satjj6Of/McmOdEcpsv05H7rp BFXh0gXM35aVXJ1XSYIhWpysUBR/vVJJ/JJYxcBk+yrIqnNTQ3Ama18IXa/o12ha0ZLV feVQ== X-Forwarded-Encrypted: i=2; AJvYcCVobBUGOvzlERjqL4fg+QIxjljLh+kwW+b0m2IxAianFbeSBmTspdGPA5K8Fytb0l+ta+JZosY=@isar-build.org X-Gm-Message-State: AOJu0Yxdkyjb/V7ySOsjoAIn4Gl9NihqM3sPdI2caIjAl5vxqMHWF5CB m7mJikPSe9jVVc56GcUyJGsL33tK6DkVL4oCAsMkenW2r1A8HS9S X-Google-Smtp-Source: AGHT+IF8G7OncKz+ZUCpfUWip5e0JG925jOq5iWSexR1b/56oUvoWLGtMRymwLTfTlsZ9BUato1MbQ== X-Received: by 2002:ac8:7d8a:0:b0:467:7745:f0a9 with SMTP id d75a77b69052e-46c70fd1dfcmr166615091cf.4.1736511052414; Fri, 10 Jan 2025 04:10:52 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:540f:0:b0:46b:cf11:757c with SMTP id d75a77b69052e-46c7a9ffa41ls31591421cf.0.-pod-prod-09-us; Fri, 10 Jan 2025 04:10:52 -0800 (PST) X-Received: by 2002:a05:620a:1714:b0:7b6:6701:7a4a with SMTP id af79cd13be357-7bcd9799d1emr1756896885a.53.1736511052010; Fri, 10 Jan 2025 04:10:52 -0800 (PST) Received: by 2002:a05:620a:bcb:b0:7b6:d72a:7c26 with SMTP id af79cd13be357-7bce2953781ms85a; Fri, 10 Jan 2025 03:50:55 -0800 (PST) X-Received: by 2002:a05:6512:12cc:b0:540:1c6e:f046 with SMTP id 2adb3069b0e04-542845b20b0mr3172228e87.36.1736509853473; Fri, 10 Jan 2025 03:50:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736509853; cv=none; d=google.com; s=arc-20240605; b=Ezx1rumvbPVKXfsFwlIJRe+FJwncczs6DIeMyJn0/VwqYOic20xTwx0zpPseTRJTFr zykQXJOWmRop2Jg1iBhBEzb9NBC7IbgN26SxRUs0ltoNUfcveG7FeX+F4fg/LF7HNEGN eLVhCQ89ljJvZwVh3znxdmJgiUuxU8fWiZPupIO04/SEGJJHMUeisDj3ZqBPMfDcF9vp Yecw1kd03/zxpoHjafVZ9UFsF2olDK6H6G3UwweeKRnhJIUwSvN00PC07r2fIIT3NZWd wvQS9uZjpFcv/xUOTN2UB3xb7NoS1dqYWlaKczsn72lvMW6T5mV4thCgE4uYvAPRZ69D MFvw== 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:message-id:date :subject:cc:to:from:dkim-signature; bh=4ATBwZ6Mzfn97JqJjBQ3ZB4+geRCSKQsD6EzHvbgy8w=; fh=AYVEeTj9hwhZnmbjXgkIyJh0R1nXrfdf66Lk9nf/Ip8=; b=j4eLzmi7VazyQ2fvo+Ae2i88KTa8mBuVrHyPNhQml7haK9L+d+1A3wH+7prI49GGzc pwhCmA1PYRUSunJWI3TEyARD9WnRE973fX8V2f5inJiTiRZ1rIwA9as73myHQLEMcaYn av2CBzR7z3QBEIM5hat3zZ/SqvQikKk0Ow514t2ZYS6zUN2mc5W1/gL0Ej9ZJ2qLUGW8 /FTQ6b9vyk4KH6ewQTM3YLabglm3fqEFH7pZqxR7Nk7i0scokcpNdTgbksFuUWjt8GI4 SMEQVhmTfREfurltTD1ijIhTx9VUAPBkV8Go/uGam59/lRNtFNMl/B+5dKFJMrDBAFOl NniA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@evosoft.com header.s=fm1 header.b=WudMA0R+; spf=pass (google.com: domain of fm-1328579-20250110115052e047bedde0b41274c6-ipfnz0@rts-flowmailer.evosoft.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1328579-20250110115052e047bedde0b41274c6-IPfNZ0@rts-flowmailer.evosoft.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=evosoft.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-5428c7bf683si96985e87.3.2025.01.10.03.50.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jan 2025 03:50:52 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1328579-20250110115052e047bedde0b41274c6-ipfnz0@rts-flowmailer.evosoft.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20250110115052e047bedde0b41274c6 for ; Fri, 10 Jan 2025 12:50:52 +0100 X-Patchwork-Original-From: "peter.czegledy via isar-users" From: "peter.czegledy" To: isar-users@googlegroups.com Cc: benedikt.niedermayr@siemens.com, Peter Czegledy Subject: [PATCH] wic: bootimg-efi-isar: fix generating of grub.cfg for custom initrd Date: Fri, 10 Jan 2025 12:50:28 +0100 Message-Id: <20250110115028.256057-1-peter.czegledy@evosoft.com> 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=WudMA0R+; spf=pass (google.com: domain of fm-1328579-20250110115052e047bedde0b41274c6-ipfnz0@rts-flowmailer.evosoft.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1328579-20250110115052e047bedde0b41274c6-IPfNZ0@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-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. This fixes that and furthermore cleans up some related redundant assignments to kernel variable as they do not impact the final value. Signed-off-by: Peter Czegledy --- .../lib/wic/plugins/source/bootimg-efi-isar.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 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..243824ae 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -97,20 +97,18 @@ class BootimgEFIPlugin(SourcePlugin): grubefi_conf += "timeout=%s\n" % bootloader.timeout grubefi_conf += "menuentry '%s'{\n" % (title if title else "boot") - kernel = get_bitbake_var("KERNEL_IMAGETYPE") - if get_bitbake_var("INITRAMFS_IMAGE_BUNDLE") == "1": - if get_bitbake_var("INITRAMFS_IMAGE"): - kernel = "%s-%s.bin" % \ - (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) - label = source_params.get('label') label_conf = "root=%s" % creator.rootdev if label: label_conf = "LABEL=%s" % label + temp_initrd = initrd kernel, initrd = isar_get_filenames( get_bitbake_var("IMAGE_ROOTFS"), get_bitbake_var("KERNEL_FILE") ) + if temp_initrd: + initrd = temp_initrd + grubefi_conf += "linux /%s %s rootwait %s\n" \ % (kernel, label_conf, bootloader.append) @@ -179,12 +177,6 @@ class BootimgEFIPlugin(SourcePlugin): if not custom_cfg: # Create systemd-boot configuration using parameters from wks file - kernel = get_bitbake_var("KERNEL_IMAGETYPE") - if get_bitbake_var("INITRAMFS_IMAGE_BUNDLE") == "1": - if get_bitbake_var("INITRAMFS_IMAGE"): - kernel = "%s-%s.bin" % \ - (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) - title = source_params.get('title') temp_initrd = initrd