From patchwork Thu Feb 1 11:03:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 3335 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 01 Feb 2024 12:03:57 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f59.google.com (mail-pj1-f59.google.com [209.85.216.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 411B3tpG018382 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 1 Feb 2024 12:03:57 +0100 Received: by mail-pj1-f59.google.com with SMTP id 98e67ed59e1d1-29618866018sf400248a91.3 for ; Thu, 01 Feb 2024 03:03:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706785430; cv=pass; d=google.com; s=arc-20160816; b=eCC6gPHBofN23H/7Nnse4FRyGJeA08wyE84hlukDo5aSLrdViD2byCR2LZ35k2PYxg en+5FOvN6CBMqILqacA3GijTKtQeyqQhEnf//kwU+R/5iAQ1ByvOp8ptRT5eT/1gvU6B oae6pJDOuIMJ9QzgHHQgOrBWtGAawgvZntQ5nxaI18PGsXgR0hVy5jqVPTCHMe31W7VS TQw2vLnDS4ACWhjQ0l1vmKlRhJcRL5F+9pDdnl9D+oyLo+fQEZJULGTJ6yL/Ahwkq/Js hRr3KIrJoFm3o5EcaT8rdRayUDsx5VmqjWA4IP4n/NRX295+2lQZDR8QLrbAhWVvAkIM NDGA== 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=aurYOwdMN+km+l1ZEIK7ITwEH1bLIbQKVRHA6BsDNHc=; fh=SrThR09vObaO1CFc3IXLpdztanijBUKYE5PgXlSK1KQ=; b=Nf6mmccgsPUmThFirHRJONVEvh03gkxmxhdNwVCCOtbVXWXzR9VVF6UqiVmoXoenFl E1qv9F/ctF0zPkuUmoo/37OlxEaA5DxGebcpARScLrJGgDMAFEaZWRl1ENMuZsq4Eq50 Apd6G94hps7LTkB0YWqPFT4ssKpHVuyfZ0JPvwEoZ0WCot+UGmn3fyoCIwf5jJleW1fa J2hcTB0zGsP//KBeRnVaEXNfRlDwfqOQE2GTEX25HSWJU+76QedSNZ6CBYWXPsm4hlZ/ T2p74UlRPxCgDbF7t81HA0JATs7Y1oUEfz2MCH34HpQ6hoL3/AAPd0fcCPspA7b2QpXM TVIw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=HG3SMKld; spf=pass (google.com: domain of fm-51332-20240201110347bc53a488c3aee2e151-a7vbr8@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-51332-20240201110347bc53a488c3aee2e151-a7VBR8@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=1706785430; x=1707390230; 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=aurYOwdMN+km+l1ZEIK7ITwEH1bLIbQKVRHA6BsDNHc=; b=dzkGRKXu3CUMDe8Xl6oF1PuY32+Mm/TYuNTSIOHE/rkZ1AB5jBYqnWurYV5hzT1N5o aRHYa0S8T7p/o0v9lXxKJsSDhAH25SH/D9GaTJ1K3+Votw90zGtX/2D1C0pIlqT3qzVf vA82SbvEQxewT3lQ9H1pFu/9+LaLhLLfzQRg+Jzt8XT4Q3rxZjhiYVY6SpjS521VACkw vOMle7VDbKkSiM0gYM14R8pGUJEdcaoH3/VFdMEKAgrmIxO2fZoiAs97oT5k3OgiSnk8 9Mmt0q5HqopYyPgqcojMZOxdtwmyT+Vqju90QDMqgBRzL6Xe+DJevf2srDO5IQXc/xTD MClw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706785430; x=1707390230; 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=aurYOwdMN+km+l1ZEIK7ITwEH1bLIbQKVRHA6BsDNHc=; b=cCE7EaF/tLpYjfGwjmcC/R3aB9nYx2PdplQpP0OUbHi+fEqQpd51iJm2vZLng2xVn1 zwXy6+ZRem4Fapm/bDVyYCFWJYRSOHqCZV2iePJL85HRjvMPr7FuPGdk+djBdDbGBzIC qc5g68D24vE92gCbuj9ptKboS3m6ZXlLbWcRmikZPmv4852D7kCV6DRb3bD+lqdHAE4g MeGorTyLlg6LFL/AWxWvcdO+zzO6nlcXt99KDEk/XIyk76o/RDDtBRzHfEnr/FOXWoOx yd+UVu8YMLeUaGcE6iugrZE0Iw3hlRBPzYH9NksXYvOVCAAtbqYTGrNUVMc5yctzf2Ud p8tw== X-Gm-Message-State: AOJu0YxahiiMTxjPwNO3xjeu9t+X1PhPg8OrBJ4PSTuZZpMcmw29oA2v iz/GttJ7Vqi0e+WCYgZXXl+gGOvfHm5+gsUfNMNQwHXkFY+JohK8 X-Google-Smtp-Source: AGHT+IGEtmYsBAy4aYPFBVVveFyHmAjeNLvZHELbMmPfOte3ugN37CM4ZvKABr3HuTWS1s/O7eIpAQ== X-Received: by 2002:a17:90a:fe16:b0:295:f901:d78 with SMTP id ck22-20020a17090afe1600b00295f9010d78mr3578058pjb.28.1706785430267; Thu, 01 Feb 2024 03:03:50 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:4cc1:b0:296:ec1:f9b6 with SMTP id nd1-20020a17090b4cc100b002960ec1f9b6ls452908pjb.1.-pod-prod-04-us; Thu, 01 Feb 2024 03:03:49 -0800 (PST) X-Received: by 2002:a17:902:d484:b0:1d7:c24:42f0 with SMTP id c4-20020a170902d48400b001d70c2442f0mr5654568plg.57.1706785429258; Thu, 01 Feb 2024 03:03:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706785429; cv=none; d=google.com; s=arc-20160816; b=XYcN5PHJLv7qi4v2OrqC2JYy5T6L2Xh5bv5J5GCGmp+4bwnnY07IoKqCBvmiD8DQ4r GLviJWjTKh8OS6eaVm5exzc1Djw0odiDDJZk03w5v7rb0TrTixWQeI+QBH4aRiW6PI9I 19KnN9U2RmjamXbTlB8Ord9ECINJKGA7mZzS5AZVlk5GZmpLbmbk2eZPdYuWR8krI/yc uw+bSgcT92KkkIO7po3B30c4qt3fo6adP1VeuL70whvbXDYH5WLbOaDlpQXq9q5GS2Sj g4y06y1Luo6gsei8UyQSJyJnA89W2JNs/wOPzUOcl7m4QTZVUudf4KG17Rbs7UezfAYb wM/w== 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=My9N1CTmJKosYQghiHHWHkDPxok/RyLcZEWUOr22p2E=; fh=SrThR09vObaO1CFc3IXLpdztanijBUKYE5PgXlSK1KQ=; b=Khu+Tt6xFy0BZdcTut1fEiQ4gOHbpIsJMDqQzoGzKAiB08F27I3zC6YTpTSeinL+fJ 9HhNX9h77yh8dUH81KfHry8hLgmYVUQf3ovuIJbmxVVeuUUcFy/ySFCAl+a8fHU683B6 bNQag+Sr0CS3RlJawQIjCMt6pp0AO7vnRThGO9s2UJrGWXmJzWDeu3nnplzRDgY3aJEd 3dijznQEtkrht8xTdECg1Cg6xsQMZjI1i/Dft5x2wk/unPfW3lZ/G7WQWrO+3GsDMwvz +C8Me2fdV9ZZ9U7NYOTutUJKjwIGS+gdiLxdxf2uElfJyt17M7JMB9w0qrZ9mjz/ZCDF 09/Q==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=HG3SMKld; spf=pass (google.com: domain of fm-51332-20240201110347bc53a488c3aee2e151-a7vbr8@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-51332-20240201110347bc53a488c3aee2e151-a7VBR8@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Forwarded-Encrypted: i=0; AJvYcCU/OI3P5o7oNI51IaAWY3RgDh7WCVbHPt5cde0G0dug7P33pRMS311CaL8NDXW0RIUuWp8T5NdiuXjBFi6NlpCrCspf6fkn7WJYukI= Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id n9-20020a170902d2c900b001d6f295bc4esi592639plc.4.2024.02.01.03.03.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2024 03:03:49 -0800 (PST) Received-SPF: pass (google.com: domain of fm-51332-20240201110347bc53a488c3aee2e151-a7vbr8@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240201110347bc53a488c3aee2e151 for ; Thu, 01 Feb 2024 12:03:47 +0100 X-Patchwork-Original-From: "'Quirin Gylstorff' via isar-users" From: Quirin Gylstorff To: felix.moessbauer@siemens.com, ubely@ilbers.de, isar-users@googlegroups.com Subject: [PATCH v2] wic/plugins/bootimg-efi-isar: Use initrd from source params Date: Thu, 1 Feb 2024 12:03:21 +0100 Message-ID: <20240201110346.3558643-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=HG3SMKld; spf=pass (google.com: domain of fm-51332-20240201110347bc53a488c3aee2e151-a7vbr8@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-51332-20240201110347bc53a488c3aee2e151-a7VBR8@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_H3,RCVD_IN_MSPIKE_WL,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 --- Changes v2: - simplify assignment meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 3 +++ 1 file changed, 3 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..4bfb70a0 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,10 @@ class BootimgEFIPlugin(SourcePlugin): title = source_params.get('title') + 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")