From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7327988128800571392 X-Received: by 2002:a17:90a:b014:b0:296:be2:85be with SMTP id x20-20020a17090ab01400b002960be285bemr1807086pjq.9.1706785430390; 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-Google-Smtp-Source: AGHT+IEhqUOpXWLHKInC8jOifKRkaLYkzCZo3c+8mFL+0ksMxsFn/jRK11uhMOZMsAE3Z/cQ285U 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= Return-Path: 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; 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 Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240201110347bc53a488c3aee2e151 for ; Thu, 01 Feb 2024 12:03:47 +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=My9N1CTmJKosYQghiHHWHkDPxok/RyLcZEWUOr22p2E=; b=HG3SMKldN72vcI2h+dQHSxAxQM58eE3hwNKXJWXLcDyA67HbKBE+XCRn/oqxh/Ek0WOvZi fVecH6Fr7RoH6bJ7ZSP+urEHrNM9YEDyQM0Cyr1aDQIFpdsuh0OhFPvzBS3Gr4LKpHhLAtIe lRHsx8SYzpwRQE4zQCihNVcPsLXZg=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-TUID: ySz24MW23tby 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") -- 2.43.0