From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7130878582899867648 X-Received: by 2002:a05:6512:31cd:b0:48a:f0a8:5374 with SMTP id j13-20020a05651231cd00b0048af0a85374mr900790lfe.321.1660287054597; Thu, 11 Aug 2022 23:50:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9d85:0:b0:25e:6a5b:9a4c with SMTP id c5-20020a2e9d85000000b0025e6a5b9a4cls659746ljj.6.-pod-prod-gmail; Thu, 11 Aug 2022 23:50:53 -0700 (PDT) X-Google-Smtp-Source: AA6agR4hXGRmSABuLh7a4+9Hg3TE+5wwFA2TEHVFHIKbILiA1P+lDxLWuGlmgzh9thcMWCq1He3O X-Received: by 2002:a2e:8081:0:b0:253:ce61:3c66 with SMTP id i1-20020a2e8081000000b00253ce613c66mr743344ljg.98.1660287053055; Thu, 11 Aug 2022 23:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660287053; cv=none; d=google.com; s=arc-20160816; b=kLX2VYtyAEzY7ji+T+eqwe4bgik/YcQhKKvfqaVHwusv6ZQ60kGFGQCj/IYe8+oAD3 FfOADpN76eUQ2EzCoSf9nSaqa0hKnGrk8qb+Yshq+CElYt9BqO40ft2QKccunpHJkUY2 npmpYOn0Ux+tjG88FeWBdD5h+F13QdGmXm0yb/taSHwZRca7lhEJ/ggKV4sRzxxrgr6U bI9whiLkl90P8U+9cUkr/EegcOKeOl0Q+p0jQdbJHEPYNmA/bLYhFDH5NqkrMcriN6pE tdroCTUgLFef7gfR5c6aP4tSvFZ3h3Yk8MD2GudfQ0xLkMMkb503SnTX+gHBS52GoAsY mUSg== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=qiMSeiJTJbSBgbPIvV0zK5N6RY++TmFg2Yhey953Ajs=; b=0O+S5vdzckEfwYra9rExLhqGBEdwXEcpe64OPFg/xJNveUi3OMgWO4eAwGGR8N4TVX flTrg/efVaXYzDkxlIwUxne+2XQ/gRcOt2rgJxtBX3Q51jQTjgg0veKQ6NJhg8uTBn28 PA2xf8IbDumfLFiVtXb5b6ifnyVM5fPXSk5iS96aqIFWF7eMGoRtOQNaWjfgUgRtntoL QHTQQvUBqsx/f/OY45nPCupupXbyIcU/ehv2MqK9bM0tGzfkgnFfxo8jIDd5rJRnEB0p SfA+UORKZaoaNB0BEto9ne0UcJWn/18mT2VfOylFc6u7BWywkC7jewDUzvs7N/rlNbdk YrXw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=fvUL8n8L; spf=pass (google.com: domain of fm-72506-202208120650527894bdd05a54100eb3-bretv5@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-202208120650527894bdd05a54100eb3-BrEtv5@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id o26-20020ac25e3a000000b0048b9bd44f26si41623lfg.9.2022.08.11.23.50.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Aug 2022 23:50:52 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202208120650527894bdd05a54100eb3-bretv5@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=fvUL8n8L; spf=pass (google.com: domain of fm-72506-202208120650527894bdd05a54100eb3-bretv5@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-202208120650527894bdd05a54100eb3-BrEtv5@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 202208120650527894bdd05a54100eb3 for ; Fri, 12 Aug 2022 08:50:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=qiMSeiJTJbSBgbPIvV0zK5N6RY++TmFg2Yhey953Ajs=; b=fvUL8n8LqV3qg+SMGZZFlxH9WHpJPFIUOt5lBtC/JQXQvwU9DHsrgtO+yzwmU2lSEQG80m 1qlihx4BOwTjVMZXFgxPYa1cAMXPPG0w6ehbamCpAuEbUSSCz5FgTFxNW0ZMIsCWQXoDpGRE 8u8LuF9LCA06ORuL/VuabRXsi2dEs=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: amikan@ilbers.de, henning.schild@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 1/3] wic: locate systemd-boot efi files in buildchroot Date: Fri, 12 Aug 2022 08:50:37 +0200 Message-Id: <20220812065040.1580962-2-felix.moessbauer@siemens.com> In-Reply-To: <20220812065040.1580962-1-felix.moessbauer@siemens.com> References: <20220812065040.1580962-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: ByPZ7tfEMUmS This patch locates the systemd-boot efi files in the buildchroot and not the target chroot. By that, no imager-specifc dependencies have to be installed in the target rootfs. Signed-off-by: Felix Moessbauer --- meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 6 +++--- 1 file changed, 3 insertions(+), 3 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 a24e04f3..7a65a98d 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -415,9 +415,9 @@ class BootimgEFIPlugin(SourcePlugin): grub_cmd += "reiserfs regexp " + grub_modules exec_cmd(grub_cmd) elif source_params['loader'] == 'systemd-boot': - kernel_dir = os.path.join(rootfs_dir['ROOTFS_DIR'], "usr/lib/systemd/boot/efi/") - for mod in [x for x in os.listdir(kernel_dir) if x.startswith("systemd-")]: - cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % (kernel_dir, mod, hdddir, mod[8:]) + imager_efi_dir = "/usr/lib/systemd/boot/efi/" + for mod in [x for x in os.listdir(imager_efi_dir) if x.startswith("systemd-")]: + cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % (imager_efi_dir, mod, hdddir, mod[8:]) exec_cmd(cp_cmd, True) else: raise WicError("unrecognized bootimg-efi-isar loader: %s" % -- 2.30.2