summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd-boot_244.3.bb
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-02-16 11:42:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-18 23:53:54 +0000
commit548cfcb5480adab3c504f8ca321fce9acbbd8bb8 (patch)
tree6df130bf3f9edc61dc5bcd267303dbb51202d25e /meta/recipes-core/systemd/systemd-boot_244.3.bb
parente1a2a5a206438e125811c22b25bc271014fc7e76 (diff)
downloadpoky-548cfcb5480adab3c504f8ca321fce9acbbd8bb8.tar.gz
systemd: upgrade v244.1 -> v244.3
Drop all systemd-boot patches and use an additional cross-file instead to pick up EFI cc and objcopy. For EFI ld, we can use the command line efi-ld option, but have to ensure it's something which can be exec'd directly. Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c → bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values (From OE-Core rev: 59dbb6d8ed32227c26db1982099ea845d92fff81) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd-boot_244.3.bb')
-rw-r--r--meta/recipes-core/systemd/systemd-boot_244.3.bb70
1 files changed, 70 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_244.3.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb
new file mode 100644
index 0000000000..f92c639810
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd-boot_244.3.bb
@@ -0,0 +1,70 @@
1require systemd.inc
2FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
3
4require conf/image-uefi.conf
5
6DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
7
8inherit meson pkgconfig gettext
9inherit deploy
10
11LDFLAGS_prepend = "${@ " ".join(d.getVar('LD').split()[1:])} "
12
13do_write_config[vardeps] += "CC OBJCOPY"
14do_write_config_append() {
15 cat >${WORKDIR}/meson-${PN}.cross <<EOF
16[binaries]
17efi_cc = ${@meson_array('CC', d)}
18objcopy = ${@meson_array('OBJCOPY', d)}
19EOF
20}
21
22EXTRA_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.
34python __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
44FILES_${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}"
45
46RDEPENDS_${PN} += "virtual/systemd-bootconf"
47
48# Imported from the old gummiboot recipe
49TUNE_CCARGS_remove = "-mfpmath=sse"
50COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
51COMPATIBLE_HOST_x86-x32 = "null"
52
53do_compile() {
54 SYSTEMD_BOOT_EFI_ARCH="ia32"
55 if [ "${TARGET_ARCH}" = "x86_64" ]; then
56 SYSTEMD_BOOT_EFI_ARCH="x64"
57 fi
58
59 ninja src/boot/efi/${SYSTEMD_BOOT_IMAGE_PREFIX}${SYSTEMD_BOOT_IMAGE}
60}
61
62do_install() {
63 install -d ${D}${EFI_FILES_PATH}
64 install ${B}/src/boot/efi/systemd-boot*.efi ${D}${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}
65}
66
67do_deploy () {
68 install ${B}/src/boot/efi/systemd-boot*.efi ${DEPLOYDIR}
69}
70addtask deploy before do_build after do_compile