Skip to contentSkip to conversation

systemd: upgrade v244.1 -> v244.3

PATCH New Alex Kiernan 1 participant 1 message Feb 16, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH v6 1/1 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

---

Changes in v6:
- fix commit message

Changes in v5:
- use multiple cross-file support to inject the necessary binaries into meson

Changes in v4:
- add missed commit to join EFI ldflags after stripping command

Changes in v3:
- use MESON_CROSS_... for systemd-boot

Changes in v2:
- fix SRC_URI now v244.3 tag exists on v244-stable

 ...md-boot_244.1.bb => systemd-boot_244.3.bb} | 26 +++----
 ...md-conf_244.1.bb => systemd-conf_244.3.bb} |  0
 meta/recipes-core/systemd/systemd.inc         |  2 +-
 ...c-and-efi_ld-correctly-when-cross-co.patch | 62 ---------------
 ...on-print-EFI-CC-configuration-nicely.patch | 33 --------
 ...meson-use-an-array-option-for-efi-cc.patch | 77 -------------------
 ...fi-objcopy-option-to-specify-objcopy.patch | 48 ------------
 .../{systemd_244.1.bb => systemd_244.3.bb}    |  0
 8 files changed, 14 insertions(+), 234 deletions(-)
 rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} (71%)
 rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} (100%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch
 rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} (100%)
meta/recipes-core/systemd/systemd-boot_244.3.bb renamed from meta/recipes-core/systemd/systemd-boot_244.1.bb +13 -13
similarity index 71%
rename from meta/recipes-core/systemd/systemd-boot_244.1.bb
rename to meta/recipes-core/systemd/systemd-boot_244.3.bb
index 515abc289bef..f92c63981043 100644
@@ -5,27 +5,27 @@ require conf/image-uefi.conf
 
 DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
 
-# NOTE: These three patches are in theory not needed, but we haven't
-#       figured out how to correctly pass efi-cc parameter if it's an array.
-SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \
-            file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \
-            file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \
-            file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \
-            "
-
 inherit meson pkgconfig gettext
 inherit deploy
 
-EFI_CC ?= "${CC}"
+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
+}
+
 EXTRA_OEMESON += "-Defi=true \
                   -Dgnu-efi=true \
                   -Defi-includedir=${STAGING_INCDIR}/efi \
-                  -Defi-ldsdir=${STAGING_LIBDIR} \
                   -Defi-libdir=${STAGING_LIBDIR} \
+                  -Defi-ld=${@ d.getVar('LD').split()[0]} \
                   -Dman=false \
-                  -Defi-cc='${EFI_CC}' \
-                  -Defi-ld='${LD}' \
-                  -Defi-objcopy='${OBJCOPY}' \
+                  --cross-file ${WORKDIR}/meson-${PN}.cross \
                   "
 
 # install to the image as boot*.efi if its the EFI_PROVIDER,
meta/recipes-core/systemd/systemd-conf_244.3.bb renamed from meta/recipes-core/systemd/systemd-conf_244.1.bb +0 -0
similarity index 100%
rename from meta/recipes-core/systemd/systemd-conf_244.1.bb
rename to meta/recipes-core/systemd/systemd-conf_244.3.bb
meta/recipes-core/systemd/systemd.inc +1 -1
index 8c05a96ecc4f..e73b397b5d64 100644
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66"
+SRCREV = "b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6"
 SRCBRANCH = "v244-stable"
 SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
 
meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch deleted +0 -62

62 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch deleted +0 -33
deleted file mode 100644
index ed14e25bce66..000000000000
@@ -1,33 +0,0 @@
-From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001
-From: Chen Qi <[email protected]>
-Date: Tue, 26 Feb 2019 14:27:49 +0800
-Subject: [PATCH] Revert "meson: print EFI CC configuration nicely"
-
-This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293.
-
-This patch is here because we haven't figured out how to pass
-parameter to efi-cc if it's an array in systemd-boot recipe.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Chen Qi <[email protected]>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 70fb218..30df834 100644
---- a/meson.build
-+++ b/meson.build
-@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1
-         if have_gnu_efi
-                 status += [
-                         'EFI machine type:                  @0@'.format(EFI_MACHINE_TYPE_NAME),
--                        'EFI CC                             @0@'.format(' '.join(efi_cc)),
-+                        'EFI CC                             @0@'.format(efi_cc),
-                         'EFI lib directory:                 @0@'.format(efi_libdir),
-                         'EFI lds directory:                 @0@'.format(efi_ldsdir),
-                         'EFI include directory:             @0@'.format(efi_incdir)]
--- 
-2.7.4
-
meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch deleted +0 -77

77 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch deleted +0 -48

48 lines not on this page · raw message

meta/recipes-core/systemd/systemd_244.3.bb renamed from meta/recipes-core/systemd/systemd_244.1.bb +0 -0
similarity index 100%
rename from meta/recipes-core/systemd/systemd_244.1.bb
rename to meta/recipes-core/systemd/systemd_244.3.bb
Signature · 1 line
2.17.1