diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-08-15 20:35:51 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-17 19:57:28 +0100 |
commit | d43ec090ceb2bf0016a065103a4c34d0c43cb906 (patch) | |
tree | b36aa503d887759b00706f472e596acc53ab6096 /meta/recipes-core/systemd/systemd-boot_251.4.bb | |
parent | a2f0405a8140132fb374801bbabdbb016d269b15 (diff) | |
download | openembedded-core-contrib-d43ec090ceb2bf0016a065103a4c34d0c43cb906.tar.gz |
systemd: Upgrade to 251.4 and fix build with binutils 2.39
The mount.h conflict patch is now upstream so drop it.
Additionally this version fixes build with binutils-2.39 [1]
[1] https://github.com/systemd/systemd-stable/commit/8a6f966be404897b5333c218701965ac3b5a0806
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd-boot_251.4.bb')
-rw-r--r-- | meta/recipes-core/systemd/systemd-boot_251.4.bb | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_251.4.bb b/meta/recipes-core/systemd/systemd-boot_251.4.bb new file mode 100644 index 0000000000..b67706b731 --- /dev/null +++ b/meta/recipes-core/systemd/systemd-boot_251.4.bb @@ -0,0 +1,73 @@ +require systemd.inc +FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" + +require conf/image-uefi.conf + +DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native python3-jinja2-native" + +inherit meson pkgconfig gettext +inherit deploy + +LDFLAGS:prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " + +do_write_config[vardeps] += "CC OBJCOPY" +do_write_config:append() { + cat >${WORKDIR}/meson-${PN}.cross <<EOF +[binaries] +efi_cc = ${@meson_array('CC', d)} +objcopy = ${@meson_array('OBJCOPY', d)} +EOF +} + +EFI_LD = "bfd" + +EXTRA_OEMESON += "-Defi=true \ + -Dgnu-efi=true \ + -Defi-includedir=${STAGING_INCDIR}/efi \ + -Defi-libdir=${STAGING_LIBDIR} \ + -Defi-ld=${EFI_LD} \ + -Dman=false \ + --cross-file ${WORKDIR}/meson-${PN}.cross \ + " + +# install to the image as boot*.efi if its the EFI_PROVIDER, +# otherwise install as the full name. +# This allows multiple bootloaders to coexist in a single image. +python __anonymous () { + import re + target = d.getVar('TARGET_ARCH') + prefix = "" if d.getVar('EFI_PROVIDER') == "systemd-boot" else "systemd-" + systemdimage = prefix + d.getVar("EFI_BOOT_IMAGE") + d.setVar("SYSTEMD_BOOT_IMAGE", systemdimage) + prefix = "systemd-" if prefix == "" else "" + d.setVar("SYSTEMD_BOOT_IMAGE_PREFIX", prefix) +} + +FILES:${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}" + +RDEPENDS:${PN} += "virtual-systemd-bootconf" + +# Imported from the old gummiboot recipe +TUNE_CCARGS:remove = "-mfpmath=sse" + +COMPATIBLE_HOST = "(aarch64.*|arm.*|x86_64.*|i.86.*)-linux" +COMPATIBLE_HOST:x86-x32 = "null" + +do_compile() { + ninja \ + src/boot/efi/${SYSTEMD_BOOT_IMAGE_PREFIX}${SYSTEMD_BOOT_IMAGE} \ + src/boot/efi/linux${EFI_ARCH}.efi.stub +} + +do_install() { + install -d ${D}${EFI_FILES_PATH} + install ${B}/src/boot/efi/systemd-boot*.efi ${D}${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE} +} + +do_deploy () { + install ${B}/src/boot/efi/systemd-boot*.efi ${DEPLOYDIR} + install ${B}/src/boot/efi/linux*.efi.stub ${DEPLOYDIR} +} + +addtask deploy before do_build after do_compile + |