From patchwork Thu Jan 25 10:55:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 3319 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 25 Jan 2024 11:56:39 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-yb1-f187.google.com (mail-yb1-f187.google.com [209.85.219.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40PAubaX011914 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Jan 2024 11:56:38 +0100 Received: by mail-yb1-f187.google.com with SMTP id 3f1490d57ef6-dbe9dacc912sf8274474276.2 for ; Thu, 25 Jan 2024 02:56:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706180192; cv=pass; d=google.com; s=arc-20160816; b=ji+Pr8l0CW9N9tZu6fI0qFrAfBo/V/8tqBVkp+MmAn0hgz0Lk+egewKCY5zMRk+/BM FZVbL1HwExhIgNeTxxP8U90sw+4G5MKVUxzb7fPD7//EyBfrU+jDly0xSXvTj+NV7ube jPJfzwH515mzL9KROusdj64C5pyj13eEBv0I/4DJ2FctRaXpUStd7eKg5gfEebR1rFe/ r8RyV4asg3VdR8kMjZvjgyrgDZqQrPO8ogjFKUfAgBHMbV0MHJlyitXJHCNHeovl16JE qUgs+HBLKDCny/QiaUUyC3DWDQossJ+Zca5HI5spLuXOS31AMsXh31mqmWQrvXN7T1y0 BIQg== 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:reply-to:feedback-id:mime-version :message-id:date:subject:to:from:dkim-signature; bh=LM9c2+UGyvl6ErO9oeWe59kk/G+GZVDISFFOeNLDLoU=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=c16N5fIldP2Eqw+3iV2Lo8LSrfx4qvLJDekRkJFTML08frNB7Os0DDBZJxEzmKHTGp yl39By7hZW3/pQSBg0WxFBjIlPmmoyAZ/cj6C5iC4AGChkn6JGnHltcuWF6UcBp/QPAu kFLyYGZ3e6Tapt6Q0etXyT6YFRLt6Wo3XQAKnEr+1ldlY0VTEZd/cZRfBb3DMgixTduC qKGVASn1qWAIbEvMlQbFJi6kY+oNhP2QohdYoCHPIX+pOJMJXl5KT2BfmVGV+q/MKxP/ ePhi6hZAsiM5dfzsryhRgMoh3s5UjAYOETFbG0kTyAOvUNCzjWFgYw3RYM9yPimtKBoR VYSg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=f0dP9xUz; spf=pass (google.com: domain of fm-51332-20240125105629b0e3fbea6ba96c1ee5-wzd81v@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-51332-20240125105629b0e3fbea6ba96c1ee5-wzd81V@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1706180192; x=1706784992; 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:to:from:from:to:cc:subject :date:message-id:reply-to; bh=LM9c2+UGyvl6ErO9oeWe59kk/G+GZVDISFFOeNLDLoU=; b=aelNUKv9Gey9DoYHGUgNIbgEkYpKVevVaNHAgFm4tDcWjBR/pAhT2Bv7dOfj5BlqVR Biuc8JeV9rS+IkkEpbcHT8qVFIgveqhKeVDszoCa95HJ2Afp/wc513bDeC/TeYUSMqid iFoLEHIIy3Isj4zwJJteIW3YxH5WqdJmGxwY84C2oCvp0sX/oczXsAYnVjEtpUzDqtIo ht1jIi3Nkbw5uEerZfKyKWuWeXeFp1xo1i0cemcAKzqqB6XuNw726VFYsYJR4dP9oA9e NAuSyiplql57ovEwhFPe/wmsSeFhHULtmHgVkHDtcUMcdebZ/QG0/64PhwAypls8ediT /4Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706180192; x=1706784992; 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:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LM9c2+UGyvl6ErO9oeWe59kk/G+GZVDISFFOeNLDLoU=; b=Qool9QsCbap6T7J6DbcyQfjLKeoqQw47/wRkuYJbTF+oYAVuvpvvEsGH1eCbIQQybO gJvFCaY4Ez4kqwCKL3Ik6Sv4XtuJ4tJ3Dd9zXBuXX1gg4h9AZqvnALP6hbk92rATcjhC +ryJ/muo08BZzhzv8oVZvsu15OY8JTtYHtaB1IJ2Pgfu8vHhjoltjCJaNaroiYXh1hmi JHsJQcuWL0HUQj7elxEzFBZRBNBdybpxRHusF9fpdUvXbKbLf9bKZpkSvw0ewpSD0MwW 1k21wz59S4N/RcByRtWtNmTu0FlqGv5/ZOGMKK4+2f9VuwRuWQZ/VeCU9H0/BWo8vvi7 8Nkw== X-Gm-Message-State: AOJu0YzXTzjz3nih4Dg/0C/owiijuW894HEL2DN6kLgBrmTPBtVMQcp1 fo2ZdYZaaLUP3vWwZ4ij3kkqnKG3OeBEvo9v7iCaVDErzAU9lYTf X-Google-Smtp-Source: AGHT+IE1atHp85UaWEh49Dg2reMVnm9qDX5Rsibm1WkHHt4mZgNJVhqHETugb2FoC3e9yKoEuyhK1A== X-Received: by 2002:a5b:106:0:b0:dc6:2c3c:410 with SMTP id 6-20020a5b0106000000b00dc62c3c0410mr104028ybx.111.1706180192141; Thu, 25 Jan 2024 02:56:32 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6902:726:b0:dbe:ac1f:ac3f with SMTP id l6-20020a056902072600b00dbeac1fac3fls347672ybt.0.-pod-prod-04-us; Thu, 25 Jan 2024 02:56:31 -0800 (PST) X-Received: by 2002:a0d:ea52:0:b0:5ff:8117:4e7e with SMTP id t79-20020a0dea52000000b005ff81174e7emr544186ywe.70.1706180191368; Thu, 25 Jan 2024 02:56:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706180191; cv=none; d=google.com; s=arc-20160816; b=h/uQ3qPrjlTo/pdFGO4VT4+njAhs8SmLaNCYRZMRJm/wWsmkQoxzssfmqxLff3JYM1 hl9l8fTH+/VF1bkbJ97Jmw0hA/zNv374cm+W35ummszEU0vdGYmfDLqj6kYPz6CNCaNS gmNfLWxIFWpssNIXIF+gTK9GAEzD/e3L7/8fx6C6ucRX9vK383bbwUU1pjyuNfPYpwQ+ SMTSYxMWkvfRwx3IjyJ8jHNTQd9QjCbMPLVaIcJO5+DejysoB/Gpi2cEB+gDXgxLXaQf DhLomyK9UyYnwSKGuTRCW45XfD6DqlufLwmYVgqExSTblipSl/e96aPoxzYjKCMvVGzx QKiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:to:from:dkim-signature; bh=8L5mPUWm/pFkuPSRJBRi9+w6QSoSIyLpOEyBvWOlBKo=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=omQTvcWbdPmy+N/SLzYTLu850vszwfDBLaGv0FxPP48jlNLlpUri6pIZ3KqhxSn6Dq th726y9HO4Yly6eyycFO8zuCF4rBIIyjLwbfcB25tKw/OeYljuR8aJgYXEzlrvKrg1LG QeNv9wsjHtyWUM24M6XJfyoVVKyZQAKfP8ookC79R3VQ4CChddZUEcUrqi5kE3gwlN7+ F44rGCGVzb9REQOY9Gpdv1rsvT9Ql2PaDlOLfKT44fy7R4lo25C7I/NdP0wc5xGGdxxQ fLm7MxavR2PGsJTXSFFIQo3mDE6fAyMperwKxFaL541Rllk/ItIbuuKeftfiRhQyVd+b 5a/w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=f0dP9xUz; spf=pass (google.com: domain of fm-51332-20240125105629b0e3fbea6ba96c1ee5-wzd81v@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-51332-20240125105629b0e3fbea6ba96c1ee5-wzd81V@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id n65-20020a0dcb44000000b005ff7aab3b18si187335ywd.2.2024.01.25.02.56.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2024 02:56:31 -0800 (PST) Received-SPF: pass (google.com: domain of fm-51332-20240125105629b0e3fbea6ba96c1ee5-wzd81v@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20240125105629b0e3fbea6ba96c1ee5 for ; Thu, 25 Jan 2024 11:56:29 +0100 X-Patchwork-Original-From: "'Quirin Gylstorff' via isar-users" From: Quirin Gylstorff To: isar-users@googlegroups.com Subject: [PATCH] wic/plugins/bootimg-efi-isar: Use initrd from source params Date: Thu, 25 Jan 2024 11:55:32 +0100 Message-ID: <20240125105628.2041417-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-Original-Sender: quirin.gylstorff@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=f0dP9xUz; spf=pass (google.com: domain of fm-51332-20240125105629b0e3fbea6ba96c1ee5-wzd81v@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-51332-20240125105629b0e3fbea6ba96c1ee5-wzd81V@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Quirin Gylstorff Reply-To: Quirin Gylstorff 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=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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: Quirin Gylstorff This fixes the issue that you can add a initrd with the source params but it will still boot the initial initrd. Signed-off-by: Quirin Gylstorff --- meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 5 +++++ 1 file changed, 5 insertions(+) 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 b934d0c7..27d40756 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -185,7 +185,12 @@ class BootimgEFIPlugin(SourcePlugin): title = source_params.get('title') + temp_initrd = None + if initrd: + temp_initrd = initrd kernel, initrd = isar_get_filenames(get_bitbake_var("IMAGE_ROOTFS")) + if temp_initrd: + initrd = temp_initrd boot_conf = "" boot_conf += "title %s\n" % (title if title else "boot")