diff options
author | Ross Burton <ross.burton@arm.com> | 2023-08-10 17:24:46 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-21 11:34:12 +0100 |
commit | 7f58848a324cd5ff1a297a4d7ab2c7fbae990967 (patch) | |
tree | 4cbe989a1bba41cd2bea2ada6d9ae9eff4d18020 | |
parent | 90801cd8cb23719031aaaba1578a8446e1824cad (diff) | |
download | poky-7f58848a324cd5ff1a297a4d7ab2c7fbae990967.tar.gz |
systemd-boot: improve cross file generation
The meson.cross generated by the class already has c and objcopy
entries, so these can be removed.
Pass the --cross-file option in MESON_CROSS_FILE to ensure the ordering
is always correct.
(From OE-Core rev: 302551de19edb1eb7333a6d1d5fdddacdbb9c349)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd-boot_254.bb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_254.bb b/meta/recipes-core/systemd/systemd-boot_254.bb index 1b8ff6e3ab..642a5fafe7 100644 --- a/meta/recipes-core/systemd/systemd-boot_254.bb +++ b/meta/recipes-core/systemd/systemd-boot_254.bb | |||
@@ -13,22 +13,21 @@ LDFLAGS:prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " | |||
13 | EFI_LD = "bfd" | 13 | EFI_LD = "bfd" |
14 | LDFLAGS:append = " -fuse-ld=${EFI_LD}" | 14 | LDFLAGS:append = " -fuse-ld=${EFI_LD}" |
15 | 15 | ||
16 | do_write_config[vardeps] += "CC OBJCOPY EFI_LD" | 16 | do_write_config[vardeps] += "EFI_LD" |
17 | do_write_config:append() { | 17 | do_write_config:append() { |
18 | cat >${WORKDIR}/meson-${PN}.cross <<EOF | 18 | cat >${WORKDIR}/meson-${PN}.cross <<EOF |
19 | [binaries] | 19 | [binaries] |
20 | c = ${@meson_array('CC', d)} | ||
21 | objcopy = ${@meson_array('OBJCOPY', d)} | ||
22 | c_ld = ${@meson_array('EFI_LD', d)} | 20 | c_ld = ${@meson_array('EFI_LD', d)} |
23 | EOF | 21 | EOF |
24 | } | 22 | } |
25 | 23 | ||
24 | MESON_CROSS_FILE:append = " --cross-file ${WORKDIR}/meson-${PN}.cross" | ||
25 | |||
26 | MESON_TARGET = "systemd-boot" | 26 | MESON_TARGET = "systemd-boot" |
27 | 27 | ||
28 | EXTRA_OEMESON += "-Defi=true \ | 28 | EXTRA_OEMESON += "-Defi=true \ |
29 | -Dbootloader=true \ | 29 | -Dbootloader=true \ |
30 | -Dman=false \ | 30 | -Dman=false \ |
31 | --cross-file ${WORKDIR}/meson-${PN}.cross \ | ||
32 | " | 31 | " |
33 | 32 | ||
34 | # install to the image as boot*.efi if its the EFI_PROVIDER, | 33 | # install to the image as boot*.efi if its the EFI_PROVIDER, |