diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-11-10 19:12:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-11 13:43:37 +0000 |
commit | 1d96287906f66ad28e50c9686eaffc2fb7b874fe (patch) | |
tree | 352484993f7f7d614ed2f3e320d4cd6dcff0d3ca /meta/recipes-core/systemd/systemd-boot_251.4.bb | |
parent | 835aca65ccb5eda00fbfe51ab203a8df791be83a (diff) | |
download | openembedded-core-contrib-1d96287906f66ad28e50c9686eaffc2fb7b874fe.tar.gz |
systemd: update 251.4 -> 251.8
This resolves systemd-boot fails with latest meson,
while systemd -> 252 is being prepared.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
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, 0 insertions, 73 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_251.4.bb b/meta/recipes-core/systemd/systemd-boot_251.4.bb deleted file mode 100644 index b67706b731..0000000000 --- a/meta/recipes-core/systemd/systemd-boot_251.4.bb +++ /dev/null @@ -1,73 +0,0 @@ -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 - |