From ff8a4d20568643edb68dfecbc56b28bcfabc355d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= Date: Mon, 3 Feb 2025 13:10:47 +0100 Subject: [PATCH] uki: modify uki.bbclass to make image build and inherit it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Iwanicki --- meta-dts-distro/classes-recipe/uki.bbclass | 7 ++++--- meta-dts-distro/recipes-dts/images/dts-base-image.bb | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta-dts-distro/classes-recipe/uki.bbclass b/meta-dts-distro/classes-recipe/uki.bbclass index 92f6905..edf6b7f 100644 --- a/meta-dts-distro/classes-recipe/uki.bbclass +++ b/meta-dts-distro/classes-recipe/uki.bbclass @@ -64,12 +64,12 @@ DEPENDS += "\ os-release \ systemd-boot \ systemd-boot-native \ - virtual/cross-binutils \ + binutils-cross-${TARGET_ARCH} \ virtual/kernel \ + python3-pefile-native \ " inherit image-artifact-names -require ../conf/image-uefi.conf INITRAMFS_IMAGE ?= "core-image-minimal-initramfs" @@ -94,12 +94,13 @@ do_uki[depends] += " \ " do_uki[depends] += "${@ '${INITRAMFS_IMAGE}:do_image_complete' if d.getVar('INITRAMFS_IMAGE') else ''}" -# ensure that the build directory is empty everytime we generate a newly-created uki +# ensure that the build directory is empty every time we generate a newly-created uki do_uki[cleandirs] = "${B}" # influence the build directory at the start of the builds do_uki[dirs] = "${B}" # we want to allow specifying files in SRC_URI, such as for signing the UKI +# nooelint: oelint.task.noanonpython python () { d.delVarFlag("do_fetch","noexec") d.delVarFlag("do_unpack","noexec") diff --git a/meta-dts-distro/recipes-dts/images/dts-base-image.bb b/meta-dts-distro/recipes-dts/images/dts-base-image.bb index 598cc9f..c984be0 100644 --- a/meta-dts-distro/recipes-dts/images/dts-base-image.bb +++ b/meta-dts-distro/recipes-dts/images/dts-base-image.bb @@ -1 +1,2 @@ require dts-base-image.inc +inherit uki