diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-03-07 10:28:36 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-20 09:59:33 +0000 |
commit | f49ee61422c867516db252054e993df29f775136 (patch) | |
tree | efac1a51a35f87a023c43d61d762d993114a2209 /meta/recipes-core/systemd/systemd-boot_237.bb | |
parent | aacaf836ba7d53590ea9a3bd76bab16d02c9ffbb (diff) | |
download | poky-8295aebb020917845eeb37e3fa2feed3f377c14b.tar.gz |
systemd-boot: upgrade to 2372.5_M3
Upgrade systemd-boot to 237.
As systemd has dropped autotools support, fix configure and compile
failures related to meson.
(From OE-Core rev: 086308aa2a5e332de6f00ed397c4a55d132f158f)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd-boot_237.bb')
-rw-r--r-- | meta/recipes-core/systemd/systemd-boot_237.bb | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_237.bb b/meta/recipes-core/systemd/systemd-boot_237.bb new file mode 100644 index 0000000000..afd3848f29 --- /dev/null +++ b/meta/recipes-core/systemd/systemd-boot_237.bb | |||
@@ -0,0 +1,70 @@ | |||
1 | require systemd.inc | ||
2 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" | ||
3 | |||
4 | DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" | ||
5 | |||
6 | SRC_URI += "file://0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ | ||
7 | file://0027-remove-nobody-user-group-checking.patch \ | ||
8 | file://0001-Also-check-i386-i586-and-i686-for-ia32.patch \ | ||
9 | file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ | ||
10 | " | ||
11 | |||
12 | inherit meson pkgconfig gettext | ||
13 | inherit deploy | ||
14 | |||
15 | EFI_CC ?= "${CC}" | ||
16 | EXTRA_OEMESON += "-Defi=true \ | ||
17 | -Dgnu-efi=true \ | ||
18 | -Defi-includedir=${STAGING_INCDIR}/efi \ | ||
19 | -Defi-ldsdir=${STAGING_LIBDIR} \ | ||
20 | -Defi-libdir=${STAGING_LIBDIR} \ | ||
21 | -Dman=false \ | ||
22 | -Defi-cc='${EFI_CC}' \ | ||
23 | -Defi-ld='${LD}' \ | ||
24 | " | ||
25 | |||
26 | # install to the image as boot*.efi if its the EFI_PROVIDER, | ||
27 | # otherwise install as the full name. | ||
28 | # This allows multiple bootloaders to coexist in a single image. | ||
29 | python __anonymous () { | ||
30 | import re | ||
31 | target = d.getVar('TARGET_ARCH') | ||
32 | prefix = "" if d.getVar('EFI_PROVIDER', True) == "systemd-boot" else "systemd-" | ||
33 | if target == "x86_64": | ||
34 | systemdimage = prefix + "bootx64.efi" | ||
35 | else: | ||
36 | systemdimage = prefix + "bootia32.efi" | ||
37 | d.setVar("SYSTEMD_BOOT_IMAGE", systemdimage) | ||
38 | prefix = "systemd-" if prefix == "" else "" | ||
39 | d.setVar("SYSTEMD_BOOT_IMAGE_PREFIX", prefix) | ||
40 | } | ||
41 | |||
42 | FILES_${PN} = "/boot/EFI/BOOT/${SYSTEMD_BOOT_IMAGE}" | ||
43 | |||
44 | RDEPENDS_${PN} += "virtual/systemd-bootconf" | ||
45 | |||
46 | # Imported from the old gummiboot recipe | ||
47 | TUNE_CCARGS_remove = "-mfpmath=sse" | ||
48 | COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" | ||
49 | COMPATIBLE_HOST_x86-x32 = "null" | ||
50 | |||
51 | do_compile() { | ||
52 | SYSTEMD_BOOT_EFI_ARCH="ia32" | ||
53 | if [ "${TARGET_ARCH}" = "x86_64" ]; then | ||
54 | SYSTEMD_BOOT_EFI_ARCH="x64" | ||
55 | fi | ||
56 | |||
57 | ninja src/boot/efi/${SYSTEMD_BOOT_IMAGE_PREFIX}${SYSTEMD_BOOT_IMAGE} | ||
58 | } | ||
59 | |||
60 | do_install() { | ||
61 | install -d ${D}/boot | ||
62 | install -d ${D}/boot/EFI | ||
63 | install -d ${D}/boot/EFI/BOOT | ||
64 | install ${B}/src/boot/efi/systemd-boot*.efi ${D}/boot/EFI/BOOT/${SYSTEMD_BOOT_IMAGE} | ||
65 | } | ||
66 | |||
67 | do_deploy () { | ||
68 | install ${B}/src/boot/efi/systemd-boot*.efi ${DEPLOYDIR} | ||
69 | } | ||
70 | addtask deploy before do_build after do_compile | ||