From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7327988128800571392 X-Received: by 2002:a25:a026:0:b0:dc3:6a55:77fd with SMTP id x35-20020a25a026000000b00dc36a5577fdmr600854ybh.67.1706180192219; 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-Google-Smtp-Source: AGHT+IHR2PEaaV31BYjGV1YVrx9OsPJpPo1S5xOVydhE1IfFoH/K3pLhxzvMR6+w/baszmPM7SCB 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 Return-Path: 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; 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 Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20240125105629b0e3fbea6ba96c1ee5 for ; Thu, 25 Jan 2024 11:56:29 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=8L5mPUWm/pFkuPSRJBRi9+w6QSoSIyLpOEyBvWOlBKo=; b=f0dP9xUz5oe+Yf1a4vWiY4kN5cR4g9hAcnqpKoWRaUUbubIMgGZx6yNljhBiwt9PkOhWob 84R/leah2xvBq6hkED4UhnokC7tiVDctkDU7aIHFCgBM6s8KAF12WiCHgs2+ZnfH051AxLsg ErpBGJ3qUVJVhcnfLUCdUW5JpAgFM=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-TUID: FpJEtyggf4+s 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") -- 2.43.0