summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-08-10 17:24:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-08-16 07:54:38 +0100
commitc8549277018a860fb81196210f5ff6422c1aebb9 (patch)
tree0b3bdcf20a00b6f7b8bf24b10850d58a6c771b2c
parentde6505c8fac237319c0133b8f6a019df784499ea (diff)
downloadpoky-c8549277018a860fb81196210f5ff6422c1aebb9.tar.gz
systemd-boot: use MESON_TARGET
Instead of re-implementing do_compile, use MESON_TARGET. (From OE-Core rev: d37c0f3449e1a20e3acc490150fa4c7c6ea46bd1) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd-boot_254.bb6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_254.bb b/meta/recipes-core/systemd/systemd-boot_254.bb
index 6240ee9339..1b8ff6e3ab 100644
--- a/meta/recipes-core/systemd/systemd-boot_254.bb
+++ b/meta/recipes-core/systemd/systemd-boot_254.bb
@@ -23,6 +23,8 @@ c_ld = ${@meson_array('EFI_LD', d)}
23EOF 23EOF
24} 24}
25 25
26MESON_TARGET = "systemd-boot"
27
26EXTRA_OEMESON += "-Defi=true \ 28EXTRA_OEMESON += "-Defi=true \
27 -Dbootloader=true \ 29 -Dbootloader=true \
28 -Dman=false \ 30 -Dman=false \
@@ -54,10 +56,6 @@ CFLAGS:append:libc-musl = " -D__DEFINED_wchar_t"
54COMPATIBLE_HOST = "(aarch64.*|arm.*|x86_64.*|i.86.*)-linux" 56COMPATIBLE_HOST = "(aarch64.*|arm.*|x86_64.*|i.86.*)-linux"
55COMPATIBLE_HOST:x86-x32 = "null" 57COMPATIBLE_HOST:x86-x32 = "null"
56 58
57do_compile() {
58 ninja systemd-boot
59}
60
61do_install() { 59do_install() {
62 install -d ${D}${EFI_FILES_PATH} 60 install -d ${D}${EFI_FILES_PATH}
63 install ${B}/src/boot/efi/systemd-boot*.efi ${D}${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE} 61 install ${B}/src/boot/efi/systemd-boot*.efi ${D}${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}