From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7143622811904376832 X-Received: by 2002:a17:907:743:b0:740:ef93:2ffc with SMTP id xc3-20020a170907074300b00740ef932ffcmr304278ejb.514.1663254298977; Thu, 15 Sep 2022 08:04:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:901:b0:73d:afe3:ffd9 with SMTP id i1-20020a170906090100b0073dafe3ffd9ls2520345ejd.10.-pod-prod-gmail; Thu, 15 Sep 2022 08:04:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4LTpc38fPpAB5Q8Ck5CE3TqSpVfpSRVaeMuMNeR9BLpLT8Ucf49n8KrWeyZAjy7CbvON3j X-Received: by 2002:a17:906:fd8d:b0:780:997:8b7b with SMTP id xa13-20020a170906fd8d00b0078009978b7bmr273780ejb.635.1663254297511; Thu, 15 Sep 2022 08:04:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663254297; cv=none; d=google.com; s=arc-20160816; b=w40uCc4obEAiCCw0SrwOfYNjVoTGnToUwV05wpv8s1MKbyHhO3LDmeCVOffG6Q+8Zd oYbr6pC82o9F3O/Zbgtjm1uqhkksIvvJCOCbP42exqx0u5PewMWAPkcJ6E72CLZI7J+D +ZmYsNJ1Udwzxe17sN9kNCBaz0t8qoXDtqaUmFpkEIeVtDZ2diPuRkXzS9Xz/wKGZheL Nv8d2PSNTRJgFGKRwy6kOM7d7UgRcx1GzslPFSu3UKr48MFh5h9lMVhqo5uFp55AMnbS CadcDss60gtbVAu7gWnMMgZYLcAD8OdfxfFcbo5Az95lgFZGSXzMypV8oIKcib64gc3o UswA== 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=AUzRa/fdC24YxyL3J56gpg7NvKWkvgi1qnwlUbLwnlE=; b=MRpknmGnVUt1P22WLbV+6+19psN9uvgDTkIvq11jYNAeRJW2Q+Fd7gNjZVIyVI6oam ISkE4VkIH9gVaoXswDgboZV5ns1puEjB3PjC0rMrJHzavOaM3qqzNAqBymCAsf/byiN/ vfzk+uupZHSh01rvSvIafD7anLp14GVySyibZIyQExrtmY/Iqs6neGrDfWIQJj9VcPfo mTcTVrHhIDv8UG25mGzTKr20OHoW2CKy6vfw8T3Zsumw86+Z01N228xyqCq94r1r2ug2 /1mt3cXHa8QoNPo8piKZrNCzIrSvJRDYWzRNzWXwDW6NsFNann3PAsOLzQPIVrH40NaL 57iw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=fVqrFRWb; spf=pass (google.com: domain of fm-72506-2022091515045769327466404d0ebe55-rjpnut@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-2022091515045769327466404d0ebe55-RJPnUT@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id gv57-20020a1709072bf900b0077e2b420e6esi359360ejc.0.2022.09.15.08.04.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Sep 2022 08:04:57 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-2022091515045769327466404d0ebe55-rjpnut@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=fVqrFRWb; spf=pass (google.com: domain of fm-72506-2022091515045769327466404d0ebe55-rjpnut@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-2022091515045769327466404d0ebe55-RJPnUT@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 2022091515045769327466404d0ebe55 for ; Thu, 15 Sep 2022 17:04:57 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; 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=AUzRa/fdC24YxyL3J56gpg7NvKWkvgi1qnwlUbLwnlE=; b=fVqrFRWbrJ3niOHgjbKSkcBXQxHFGpQXYyRb9/DT5Cwqn0JOvdIVYshf1x8mf1Wx+7+ezB BfK8+SqWZEYV8yV1i6Z2fTRofulw7xNhEDhB7NKX7cPVgHpekAfCF8qYT3tNi7cAlP/iQCwK uO0OSnC+GyocT/W3XIwH7OMKt4YcU=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: amikan@ilbers.de, jan.kiszka@siemens.com, henning.schild@siemens.com, Felix Moessbauer Subject: [PATCH v2 2/4] wic: locate systemd-boot efi files in buildchroot Date: Thu, 15 Sep 2022 17:04:41 +0200 Message-Id: <20220915150443.887858-3-felix.moessbauer@siemens.com> In-Reply-To: <20220915150443.887858-1-felix.moessbauer@siemens.com> References: <20220915150443.887858-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: t6JGH3gpzbyp 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bdc04547..006c8bc2 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -438,7 +438,7 @@ class BootimgEFIPlugin(SourcePlugin): elif source_params['loader'] == 'systemd-boot': # backup kernel dir before overwriting kernel_dir_orig = kernel_dir - kernel_dir = os.path.join(rootfs_dir['ROOTFS_DIR'], "usr/lib/systemd/boot/efi/") + kernel_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:]) -- 2.30.2