diff options
| author | wangmy@fujitsu.com <wangmy@fujitsu.com> | 2021-03-18 17:05:26 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-20 18:54:56 +0000 |
| commit | 43600886d774a9c52870988a7a19bcd20c6093bb (patch) | |
| tree | 66aafc22f13263a2d18692811c0cedcb966a44f4 /meta/recipes-core/systemd/systemd-boot_247.4.bb | |
| parent | 596ccd7cb809ba67d64f8f051fe4fb46032b36ae (diff) | |
| download | poky-43600886d774a9c52870988a7a19bcd20c6093bb.tar.gz | |
systemd: upgrade 247.3 -> 247.4
refresh the following patches:
systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch
systemd/0006-Include-netinet-if_ether.h.patch
(From OE-Core rev: 5db15aec00517e5b6f6585b534a2314c226841bf)
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd-boot_247.4.bb')
| -rw-r--r-- | meta/recipes-core/systemd/systemd-boot_247.4.bb | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_247.4.bb b/meta/recipes-core/systemd/systemd-boot_247.4.bb new file mode 100644 index 0000000000..249e620f4e --- /dev/null +++ b/meta/recipes-core/systemd/systemd-boot_247.4.bb | |||
| @@ -0,0 +1,70 @@ | |||
| 1 | require systemd.inc | ||
| 2 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" | ||
| 3 | |||
| 4 | require conf/image-uefi.conf | ||
| 5 | |||
| 6 | DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" | ||
| 7 | |||
| 8 | inherit meson pkgconfig gettext | ||
| 9 | inherit deploy | ||
| 10 | |||
| 11 | LDFLAGS_prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " | ||
| 12 | |||
| 13 | do_write_config[vardeps] += "CC OBJCOPY" | ||
| 14 | do_write_config_append() { | ||
| 15 | cat >${WORKDIR}/meson-${PN}.cross <<EOF | ||
| 16 | [binaries] | ||
| 17 | efi_cc = ${@meson_array('CC', d)} | ||
| 18 | objcopy = ${@meson_array('OBJCOPY', d)} | ||
| 19 | EOF | ||
| 20 | } | ||
| 21 | |||
| 22 | EXTRA_OEMESON += "-Defi=true \ | ||
| 23 | -Dgnu-efi=true \ | ||
| 24 | -Defi-includedir=${STAGING_INCDIR}/efi \ | ||
| 25 | -Defi-libdir=${STAGING_LIBDIR} \ | ||
| 26 | -Defi-ld=${@ d.getVar('LD').split()[0]} \ | ||
| 27 | -Dman=false \ | ||
| 28 | --cross-file ${WORKDIR}/meson-${PN}.cross \ | ||
| 29 | " | ||
| 30 | |||
| 31 | # install to the image as boot*.efi if its the EFI_PROVIDER, | ||
| 32 | # otherwise install as the full name. | ||
| 33 | # This allows multiple bootloaders to coexist in a single image. | ||
| 34 | python __anonymous () { | ||
| 35 | import re | ||
| 36 | target = d.getVar('TARGET_ARCH') | ||
| 37 | prefix = "" if d.getVar('EFI_PROVIDER') == "systemd-boot" else "systemd-" | ||
| 38 | systemdimage = prefix + d.getVar("EFI_BOOT_IMAGE") | ||
| 39 | d.setVar("SYSTEMD_BOOT_IMAGE", systemdimage) | ||
| 40 | prefix = "systemd-" if prefix == "" else "" | ||
| 41 | d.setVar("SYSTEMD_BOOT_IMAGE_PREFIX", prefix) | ||
| 42 | } | ||
| 43 | |||
| 44 | FILES_${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}" | ||
| 45 | |||
| 46 | RDEPENDS_${PN} += "virtual/systemd-bootconf" | ||
| 47 | |||
| 48 | # Imported from the old gummiboot recipe | ||
| 49 | TUNE_CCARGS_remove = "-mfpmath=sse" | ||
| 50 | |||
| 51 | COMPATIBLE_HOST = "(aarch64.*|arm.*|x86_64.*|i.86.*)-linux" | ||
| 52 | COMPATIBLE_HOST_x86-x32 = "null" | ||
| 53 | |||
| 54 | do_compile() { | ||
| 55 | ninja \ | ||
| 56 | src/boot/efi/${SYSTEMD_BOOT_IMAGE_PREFIX}${SYSTEMD_BOOT_IMAGE} \ | ||
| 57 | src/boot/efi/linux${EFI_ARCH}.efi.stub | ||
| 58 | } | ||
| 59 | |||
| 60 | do_install() { | ||
| 61 | install -d ${D}${EFI_FILES_PATH} | ||
| 62 | install ${B}/src/boot/efi/systemd-boot*.efi ${D}${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE} | ||
| 63 | } | ||
| 64 | |||
| 65 | do_deploy () { | ||
| 66 | install ${B}/src/boot/efi/systemd-boot*.efi ${DEPLOYDIR} | ||
| 67 | install ${B}/src/boot/efi/linux*.efi.stub ${DEPLOYDIR} | ||
| 68 | } | ||
| 69 | |||
| 70 | addtask deploy before do_build after do_compile | ||
