Skip to contentSkip to conversation

Upgrade systemd to 241

PATCH In review Chen Qi 3 participants 7 messages Mar 1, 2019 – Mar 6, 2019

Subsystems (2)
lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover Upgrade systemd to 241

The following changes since commit 4d275d97b6c572fe11668ac16d2c77c018340c7c:

perl: apply a native-only patch only to -native (2019-02-28 17:49:40 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/systemd-241
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/systemd-241

Chen Qi (3):
systemd: upgrade to 241
systemd-conf: add version info in recipe name
systemd-boot: upgrade to 241

 .../{systemd-boot_239.bb => systemd-boot_241.bb}   |  10 +-
 .../{systemd-conf.bb => systemd-conf_241.bb}       |   0
 meta/recipes-core/systemd/systemd.inc              |   2 +-
 ...ck-protector-flags-to-workaround-musl-bui.patch |  33 --
 ...t-meson-print-EFI-CC-configuration-nicely.patch |  33 ++
 ...vert-meson-use-an-array-option-for-efi-cc.patch |  77 +++
 ...tl.d-request-ECN-on-both-in-and-outgoing-.patch |  36 --
 ...nv-when-secure-versions-are-not-available.patch |  21 +-
 ...t-install-dependency-links-at-install-tim.patch |  22 +-
 ...sive-let-s-rework-the-recursive-logic-to-.patch | 219 ---------
 ...eserializing-state-always-use-read_line-L.patch | 250 ----------
 ...sure-we-have-enough-space-for-the-DHCP6-o.patch |  39 --
 ...01-do-not-disable-buffer-in-writing-files.patch | 523 +++++++++++++++++++++
 ...arse_uid-when-unmounting-user-runtime-dir.patch | 110 -----
 .../0001-meson-rename-Ddebug-to-Ddebug-extra.patch |  45 --
 ...bus-make-BUS_DEFAULT_TIMEOUT-configurable.patch | 175 -------
 ...l-Don-t-pass-null-directive-argument-to-s.patch |  31 --
 ...ync-changes-type-of-drift_freq-to-int64_t.patch |  49 --
 ...Fix-use-after-free-case-in-load_from_path.patch |  43 --
 .../0002-don-t-use-glibc-specific-qsort_r.patch    | 231 +++++----
 ...pper-instead-of-looking-for-relative-opti.patch |  14 +-
 ...fn_t-is-glibc-specific-use-raw-signature-.patch |  40 --
 ...0003-implment-systemd-sysv-install-for-OE.patch |   8 +-
 ...e.h-add-__compare_fn_t-and-comparison_fn_.patch |  61 +++
 ...llback-parse_printf_format-implementation.patch |  33 +-
 .../systemd/0004-rules-whitelist-hd-devices.patch  |  18 +-
 ...5-Make-root-s-home-directory-configurable.patch |  70 ---
 ...user-util-properly-protect-use-of-gshadow.patch |  38 --
 ...es-watch-metadata-changes-in-ide-devices.patch} |  18 +-
 ...sic-missing.h-check-for-missing-strndupa.patch} |  90 ++--
 ...patch => 0006-Include-netinet-if_ether.h.patch} |  28 +-
 .../0006-remove-nobody-user-group-checking.patch   |  63 ---
 ...if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch} |  49 +-
 ...le-nss-tests-if-nss-systemd-is-not-enable.patch |  29 --
 ...=> 0008-add-missing-FTW_-macros-for-musl.patch} |  29 +-
 ...nes-Build-conditionally-when-ENABLE_MYHOS.patch |  43 --
 ...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} |  10 +-
 ...of-__register_atfork-for-non-glibc-build.patch} |  16 +-
 ...> 0011-Use-uintmax_t-for-handling-rlim_t.patch} |  59 ++-
 ...issing.h-check-for-missing-__compar_fn_t-.patch |  48 --
 ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch |  27 ++
 ...xdecoct.c-Include-missing.h-for-strndupa.patch} |   8 +-
 ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch |  30 --
 ...c-Disable-tests-for-missing-typedefs-in-.patch} |  12 +-
 ...ss-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} |  10 +-
 ...-compatible-basename-for-non-glibc-syste.patch} |   8 +-
 ...le-buffering-when-writing-to-oom_score_a.patch} |  10 +-
 ...XSI-compliant-strerror_r-from-GNU-specif.patch} |  12 +-
 ...t_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch} |  29 +-
 ...ing_type.h-add-__compar_d_fn_t-definition.patch |  30 ++
 ...id-redefinition-of-prctl_mm_map-structure.patch |  47 ++
 ...se-if-instead-of-ifdef-for-ENABLE_GSHADOW.patch |  28 --
 ...etect-whether-struct-statx-is-defined-in-.patch | 109 -----
 ...clude-sys-wait.h-to-avoid-compile-failure.patch |  33 ++
 ...onf-fixes-for-the-compatibility-interface.patch |  58 ---
 .../0023-socket-util.h-include-string.h.patch      |  30 ++
 ...-not-store-the-iovec-entry-for-process-co.patch | 208 --------
 .../systemd/0024-test-json.c-define-M_PIl.patch    |  33 ++
 ...rnald-set-a-limit-on-the-number-of-fields.patch | 139 ------
 ...nal-fix-out-of-bounds-read-CVE-2018-16866.patch |  49 --
 .../systemd/systemd/CVE-2019-6454.patch            | 210 ---------
 ...e-receive-an-invalid-dbus-message-ignore-.patch |  61 ---
 .../systemd/{systemd_239.bb => systemd_241.bb}     |  79 ++--
 63 files changed, 1294 insertions(+), 2679 deletions(-)
 rename meta/recipes-core/systemd/{systemd-boot_239.bb => systemd-boot_241.bb} (85%)
 rename meta/recipes-core/systemd/{systemd-conf.bb => systemd-conf_241.bb} (100%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch
 create 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-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-chown-recursive-let-s-rework-the-recursive-logic-to-.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-core-when-deserializing-state-always-use-read_line-L.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-login-use-parse_uid-when-unmounting-user-runtime-dir.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-rename-Ddebug-to-Ddebug-extra.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-sd-bus-make-BUS_DEFAULT_TIMEOUT-configurable.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-sysctl-Don-t-pass-null-directive-argument-to-s.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-timesync-changes-type-of-drift_freq-to-int64_t.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0002-core-Fix-use-after-free-case-in-load_from_path.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0003-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0005-Make-root-s-home-directory-configurable.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0005-basic-user-util-properly-protect-use-of-gshadow.patch
 rename meta/recipes-core/systemd/systemd/{0007-rules-watch-metadata-changes-in-ide-devices.patch => 0005-rules-watch-metadata-changes-in-ide-devices.patch} (78%)
 rename meta/recipes-core/systemd/systemd/{0006-src-basic-missing.h-check-for-missing-strndupa.patch => 0005-src-basic-missing.h-check-for-missing-strndupa.patch} (65%)
 rename meta/recipes-core/systemd/systemd/{0007-Include-netinet-if_ether.h.patch => 0006-Include-netinet-if_ether.h.patch} (85%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0006-remove-nobody-user-group-checking.patch
 rename meta/recipes-core/systemd/systemd/{0008-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch} (81%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0008-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
 rename meta/recipes-core/systemd/systemd/{0009-add-missing-FTW_-macros-for-musl.patch => 0008-add-missing-FTW_-macros-for-musl.patch} (50%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0009-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
 rename meta/recipes-core/systemd/systemd/{0010-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch => 0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch} (80%)
 rename meta/recipes-core/systemd/systemd/{0012-fix-missing-of-__register_atfork-for-non-glibc-build.patch => 0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch} (75%)
 rename meta/recipes-core/systemd/systemd/{0013-Use-uintmax_t-for-handling-rlim_t.patch => 0011-Use-uintmax_t-for-handling-rlim_t.patch} (62%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
 rename meta/recipes-core/systemd/systemd/{0015-test-hexdecoct.c-Include-missing.h-for-strndupa.patch => 0013-test-hexdecoct.c-Include-missing.h-for-strndupa.patch} (78%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0014-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
 rename meta/recipes-core/systemd/systemd/{0016-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch => 0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch} (78%)
 rename meta/recipes-core/systemd/systemd/{0017-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch => 0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} (95%)
 rename meta/recipes-core/systemd/systemd/{0018-Define-glibc-compatible-basename-for-non-glibc-syste.patch => 0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch} (82%)
 rename meta/recipes-core/systemd/systemd/{0019-Do-not-disable-buffering-when-writing-to-oom_score_a.patch => 0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch} (82%)
 rename meta/recipes-core/systemd/systemd/{0020-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch => 0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch} (87%)
 rename meta/recipes-core/systemd/systemd/{0021-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch => 0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch} (49%)
 create mode 100644 meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0022-Use-if-instead-of-ifdef-for-ENABLE_GSHADOW.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0022-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0022-include-sys-wait.h-to-avoid-compile-failure.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0023-resolvconf-fixes-for-the-compatibility-interface.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0023-socket-util.h-include-string.h.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0024-journald-do-not-store-the-iovec-entry-for-process-co.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0025-journald-set-a-limit-on-the-number-of-fields.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0026-journal-fix-out-of-bounds-read-CVE-2018-16866.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/CVE-2019-6454.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
 rename meta/recipes-core/systemd/{systemd_239.bb => systemd_241.bb} (89%)
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 2/3 systemd-conf: add version info in recipe name

---
 meta/recipes-core/systemd/{systemd-conf.bb => systemd-conf_241.bb} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-core/systemd/{systemd-conf.bb => systemd-conf_241.bb} (100%)
meta/recipes-core/systemd/systemd-conf_241.bb renamed from meta/recipes-core/systemd/systemd-conf.bb +0 -0
similarity index 100%
rename from meta/recipes-core/systemd/systemd-conf.bb
rename to meta/recipes-core/systemd/systemd-conf_241.bb
Signature · 1 line
1.9.1
author
#3 lore raw

PATCH 3/3 systemd-boot: upgrade to 241

In reply to Chen Qi

The following two patches are added because I cannot figure out how to pass parameter to efi-cc if it's changed to be an array value.

systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch

---
 .../{systemd-boot_239.bb => systemd-boot_241.bb}   | 10 +--
 ...t-meson-print-EFI-CC-configuration-nicely.patch | 33 ++++++++++
 ...vert-meson-use-an-array-option-for-efi-cc.patch | 77 ++++++++++++++++++++++
 3 files changed, 116 insertions(+), 4 deletions(-)
 rename meta/recipes-core/systemd/{systemd-boot_239.bb => systemd-boot_241.bb} (85%)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch
meta/recipes-core/systemd/systemd-boot_241.bb renamed from meta/recipes-core/systemd/systemd-boot_239.bb +6 -4
similarity index 85%
rename from meta/recipes-core/systemd/systemd-boot_239.bb
rename to meta/recipes-core/systemd/systemd-boot_241.bb
index 2450d52..083a864 100644
@@ -3,23 +3,25 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
 
 DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
 
-SRC_URI += "file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \
-            file://0006-remove-nobody-user-group-checking.patch \
+# 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-rename-Ddebug-to-Ddebug-extra.patch \
             "
 
 inherit meson pkgconfig gettext
 inherit deploy
 
 EFI_CC ?= "${CC}"
+
 EXTRA_OEMESON += "-Defi=true \
                   -Dgnu-efi=true \
                   -Defi-includedir=${STAGING_INCDIR}/efi \
                   -Defi-ldsdir=${STAGING_LIBDIR} \
                   -Defi-libdir=${STAGING_LIBDIR} \
                   -Dman=false \
-                  -Defi-cc='${EFI_CC}' \
+                  -Defi-cc='${CC}' \
                   -Defi-ld='${LD}' \
                   "
 
meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch new file +33 -0
new file mode 100644
index 0000000..ed14e25
@@ -0,0 +1,33 @@
+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 new file +77 -0

77 lines not on this page · raw message

Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/3 systemd: upgrade to 241

In reply to Chen Qi

PATCH REBASED:
==============
0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch 0004-rules-whitelist-hd-devices.patch 0007-rules-watch-metadata-changes-in-ide-devices.patch 0001-Use-getenv-when-secure-versions-are-not-available.patch 0002-don-t-use-glibc-specific-qsort_r.patch 0004-add-fallback-parse_printf_format-implementation.patch 0006-src-basic-missing.h-check-for-missing-strndupa.patch 0007-Include-netinet-if_ether.h.patch 0008-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch 0009-add-missing-FTW_-macros-for-musl.patch 0012-fix-missing-of-__register_atfork-for-non-glibc-build.patch 0013-Use-uintmax_t-for-handling-rlim_t.patch 0014-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch 0021-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch

PATCH DROPPED:
==============
0005-Make-root-s-home-directory-configurable.patch
systemd has its hardcoded assumption about /home and /, and it also respects $HOME environment var, so this patch is somehow useless. This patch was originally added but in fact had no real runtime effect except messing up some hardcoded assumptions, and it was accidently manipulated during systemd upgrade. We have in fact not used the orignal patch for more than two releases and things were working out well.
0006-remove-nobody-user-group-checking.patch
The issue has been fixed upstream by the following commit.
"check nobody user/group validity only when not cross compiling"
0008-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch 0009-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
The issue has been fixed upstream by the following commit.
"meson: allow building resolved and machined without nss modules"
0001-login-use-parse_uid-when-unmounting-user-runtime-dir.patch 0001-sd-bus-make-BUS_DEFAULT_TIMEOUT-configurable.patch
Backport
0022-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
Merged
0023-resolvconf-fixes-for-the-compatibility-interface.patch 0001-core-when-deserializing-state-always-use-read_line-L.patch 0001-chown-recursive-let-s-rework-the-recursive-logic-to-.patch 0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch 0001-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch 0001-timesync-changes-type-of-drift_freq-to-int64_t.patch
Backport
0001-sysctl-Don-t-pass-null-directive-argument-to-s.patch 0002-core-Fix-use-after-free-case-in-load_from_path.patch
Merged
0001-meson-rename-Ddebug-to-Ddebug-extra.patch 0024-journald-do-not-store-the-iovec-entry-for-process-co.patch 0025-journald-set-a-limit-on-the-number-of-fields.patch 0026-journal-fix-out-of-bounds-read-CVE-2018-16866.patch
CVE-2019-6454.patch sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch 0005-basic-user-util-properly-protect-use-of-gshadow.patch 0022-Use-if-instead-of-ifdef-for-ENABLE_GSHADOW.patch
Backport
0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
No build failure for qemux86/qemuppc + musl

PATCH ADDED:
============
0020-missing_type.h-add-__compar_d_fn_t-definition.patch 0021-avoid-redefinition-of-prctl_mm_map-structure.patch 0022-include-sys-wait.h-to-avoid-compile-failure.patch 0023-socket-util.h-include-string.h.patch 0024-test-json.c-define-M_PIl.patch 0001-do-not-disable-buffer-in-writing-files.patch

PATCH OTHERS:
=============
0003-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch 0011-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch are combined into one patch:
0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch

Add two more PACKAGECONFIG, nss-mymachines and nss-resolve which are introduced by the following commit.
meson: allow building resolved and machined without nss modules

---
 meta/recipes-core/systemd/systemd.inc              |   2 +-
 ...ck-protector-flags-to-workaround-musl-bui.patch |  33 --
 ...tl.d-request-ECN-on-both-in-and-outgoing-.patch |  36 --
 ...nv-when-secure-versions-are-not-available.patch |  21 +-
 ...t-install-dependency-links-at-install-tim.patch |  22 +-
 ...sive-let-s-rework-the-recursive-logic-to-.patch | 219 ---------
 ...eserializing-state-always-use-read_line-L.patch | 250 ----------
 ...sure-we-have-enough-space-for-the-DHCP6-o.patch |  39 --
 ...01-do-not-disable-buffer-in-writing-files.patch | 523 +++++++++++++++++++++
 ...arse_uid-when-unmounting-user-runtime-dir.patch | 110 -----
 .../0001-meson-rename-Ddebug-to-Ddebug-extra.patch |  45 --
 ...bus-make-BUS_DEFAULT_TIMEOUT-configurable.patch | 175 -------
 ...l-Don-t-pass-null-directive-argument-to-s.patch |  31 --
 ...ync-changes-type-of-drift_freq-to-int64_t.patch |  49 --
 ...Fix-use-after-free-case-in-load_from_path.patch |  43 --
 .../0002-don-t-use-glibc-specific-qsort_r.patch    | 231 +++++----
 ...pper-instead-of-looking-for-relative-opti.patch |  14 +-
 ...fn_t-is-glibc-specific-use-raw-signature-.patch |  40 --
 ...0003-implment-systemd-sysv-install-for-OE.patch |   8 +-
 ...e.h-add-__compare_fn_t-and-comparison_fn_.patch |  61 +++
 ...llback-parse_printf_format-implementation.patch |  33 +-
 .../systemd/0004-rules-whitelist-hd-devices.patch  |  18 +-
 ...5-Make-root-s-home-directory-configurable.patch |  70 ---
 ...user-util-properly-protect-use-of-gshadow.patch |  38 --
 ...es-watch-metadata-changes-in-ide-devices.patch} |  18 +-
 ...sic-missing.h-check-for-missing-strndupa.patch} |  90 ++--
 ...patch => 0006-Include-netinet-if_ether.h.patch} |  28 +-
 .../0006-remove-nobody-user-group-checking.patch   |  63 ---
 ...if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch} |  49 +-
 ...le-nss-tests-if-nss-systemd-is-not-enable.patch |  29 --
 ...=> 0008-add-missing-FTW_-macros-for-musl.patch} |  29 +-
 ...nes-Build-conditionally-when-ENABLE_MYHOS.patch |  43 --
 ...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} |  10 +-
 ...of-__register_atfork-for-non-glibc-build.patch} |  16 +-
 ...> 0011-Use-uintmax_t-for-handling-rlim_t.patch} |  59 ++-
 ...issing.h-check-for-missing-__compar_fn_t-.patch |  48 --
 ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch |  27 ++
 ...xdecoct.c-Include-missing.h-for-strndupa.patch} |   8 +-
 ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch |  30 --
 ...c-Disable-tests-for-missing-typedefs-in-.patch} |  12 +-
 ...ss-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} |  10 +-
 ...-compatible-basename-for-non-glibc-syste.patch} |   8 +-
 ...le-buffering-when-writing-to-oom_score_a.patch} |  10 +-
 ...XSI-compliant-strerror_r-from-GNU-specif.patch} |  12 +-
 ...t_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch} |  29 +-
 ...ing_type.h-add-__compar_d_fn_t-definition.patch |  30 ++
 ...id-redefinition-of-prctl_mm_map-structure.patch |  47 ++
 ...se-if-instead-of-ifdef-for-ENABLE_GSHADOW.patch |  28 --
 ...etect-whether-struct-statx-is-defined-in-.patch | 109 -----
 ...clude-sys-wait.h-to-avoid-compile-failure.patch |  33 ++
 ...onf-fixes-for-the-compatibility-interface.patch |  58 ---
 .../0023-socket-util.h-include-string.h.patch      |  30 ++
 ...-not-store-the-iovec-entry-for-process-co.patch | 208 --------
 .../systemd/0024-test-json.c-define-M_PIl.patch    |  33 ++
 ...rnald-set-a-limit-on-the-number-of-fields.patch | 139 ------
 ...nal-fix-out-of-bounds-read-CVE-2018-16866.patch |  49 --
 .../systemd/systemd/CVE-2019-6454.patch            | 210 ---------
 ...e-receive-an-invalid-dbus-message-ignore-.patch |  61 ---
 .../systemd/{systemd_239.bb => systemd_241.bb}     |  79 ++--
 59 files changed, 1178 insertions(+), 2675 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-chown-recursive-let-s-rework-the-recursive-logic-to-.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-core-when-deserializing-state-always-use-read_line-L.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-login-use-parse_uid-when-unmounting-user-runtime-dir.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-rename-Ddebug-to-Ddebug-extra.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-sd-bus-make-BUS_DEFAULT_TIMEOUT-configurable.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-sysctl-Don-t-pass-null-directive-argument-to-s.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-timesync-changes-type-of-drift_freq-to-int64_t.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0002-core-Fix-use-after-free-case-in-load_from_path.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0003-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0005-Make-root-s-home-directory-configurable.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0005-basic-user-util-properly-protect-use-of-gshadow.patch
 rename meta/recipes-core/systemd/systemd/{0007-rules-watch-metadata-changes-in-ide-devices.patch => 0005-rules-watch-metadata-changes-in-ide-devices.patch} (78%)
 rename meta/recipes-core/systemd/systemd/{0006-src-basic-missing.h-check-for-missing-strndupa.patch => 0005-src-basic-missing.h-check-for-missing-strndupa.patch} (65%)
 rename meta/recipes-core/systemd/systemd/{0007-Include-netinet-if_ether.h.patch => 0006-Include-netinet-if_ether.h.patch} (85%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0006-remove-nobody-user-group-checking.patch
 rename meta/recipes-core/systemd/systemd/{0008-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch} (81%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0008-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
 rename meta/recipes-core/systemd/systemd/{0009-add-missing-FTW_-macros-for-musl.patch => 0008-add-missing-FTW_-macros-for-musl.patch} (50%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0009-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
 rename meta/recipes-core/systemd/systemd/{0010-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch => 0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch} (80%)
 rename meta/recipes-core/systemd/systemd/{0012-fix-missing-of-__register_atfork-for-non-glibc-build.patch => 0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch} (75%)
 rename meta/recipes-core/systemd/systemd/{0013-Use-uintmax_t-for-handling-rlim_t.patch => 0011-Use-uintmax_t-for-handling-rlim_t.patch} (62%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
 rename meta/recipes-core/systemd/systemd/{0015-test-hexdecoct.c-Include-missing.h-for-strndupa.patch => 0013-test-hexdecoct.c-Include-missing.h-for-strndupa.patch} (78%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0014-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
 rename meta/recipes-core/systemd/systemd/{0016-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch => 0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch} (78%)
 rename meta/recipes-core/systemd/systemd/{0017-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch => 0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} (95%)
 rename meta/recipes-core/systemd/systemd/{0018-Define-glibc-compatible-basename-for-non-glibc-syste.patch => 0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch} (82%)
 rename meta/recipes-core/systemd/systemd/{0019-Do-not-disable-buffering-when-writing-to-oom_score_a.patch => 0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch} (82%)
 rename meta/recipes-core/systemd/systemd/{0020-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch => 0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch} (87%)
 rename meta/recipes-core/systemd/systemd/{0021-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch => 0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch} (49%)
 create mode 100644 meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0022-Use-if-instead-of-ifdef-for-ENABLE_GSHADOW.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0022-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0022-include-sys-wait.h-to-avoid-compile-failure.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0023-resolvconf-fixes-for-the-compatibility-interface.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0023-socket-util.h-include-string.h.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0024-journald-do-not-store-the-iovec-entry-for-process-co.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0025-journald-set-a-limit-on-the-number-of-fields.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0026-journal-fix-out-of-bounds-read-CVE-2018-16866.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/CVE-2019-6454.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
 rename meta/recipes-core/systemd/{systemd_239.bb => systemd_241.bb} (89%)
meta/recipes-core/systemd/systemd.inc +1 -1
index 736e0a0..8ca3ece 100644
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "de7436b02badc82200dc127ff190b8155769b8e7"
+SRCREV = "e62a7fea757f259eb330da5b6d3ab4ede46400a2"
 
 SRC_URI = "git://github.com/systemd/systemd.git;protocol=git"
 
meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch deleted +0 -33
deleted file mode 100644
index d745800..0000000
@@ -1,33 +0,0 @@
-From 9e3816bcaa36e1a11647ca0cf4f8044449c77fe0 Mon Sep 17 00:00:00 2001
-From: Chen Qi <[email protected]>
-Date: Mon, 2 Jul 2018 15:28:22 +0800
-Subject: [PATCH] Remove fstack-protector flags to workaround musl build
-
-Remove fstack-protector and fstack-protector-strong flags to fix
-the following build failure for qemux86 and qemuppc with musl.
-
-  undefined reference to `__stack_chk_fail_local'
-
-Upstream-Status: Inappropriate [musl Specific]
-
-Signed-off-by: Chen Qi <[email protected]>
----
- meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index f432ea072..a734a295c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -333,8 +333,6 @@ possible_cc_flags = [
-         '-fdiagnostics-show-option',
-         '-fno-strict-aliasing',
-         '-fvisibility=hidden',
--        '-fstack-protector',
--        '-fstack-protector-strong',
-         '--param=ssp-buffer-size=4',
- ]
- 
--- 
-2.11.0
-
meta/recipes-core/systemd/systemd/0001-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch deleted +0 -36
deleted file mode 100644
index 7fd6d01..0000000
@@ -1,36 +0,0 @@
-From 1e190dfd5bb95036f937ef1dc46f43eb0a146612 Mon Sep 17 00:00:00 2001
-From: Thomas Hindoe Paaboel Andersen <[email protected]>
-Date: Fri, 17 Aug 2018 21:31:05 +0200
-Subject: [PATCH] Revert "sysctl.d: request ECN on both in and outgoing
- connections"
-
-Turning on ECN still causes slow or broken network on linux. Our tcp
-is not yet ready for wide spread use of ECN.
-
-This reverts commit 919472741dba6ad0a3f6c2b76d390a02d0e2fdc3.
-
-https://github.com/systemd/systemd/issues/9748
-
-Upstream-Status: Backport
-Signed-off-by: Alex Kiernan <[email protected]>
----
- sysctl.d/50-default.conf | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf
-index b67ae87ca6b7..e263cf06284a 100644
---- a/sysctl.d/50-default.conf
-+++ b/sysctl.d/50-default.conf
-@@ -33,9 +33,6 @@ net.ipv4.conf.all.promote_secondaries = 1
- # Fair Queue CoDel packet scheduler to fight bufferbloat
- net.core.default_qdisc = fq_codel
- 
--# Request Explicit Congestion Notification (ECN) on both in and outgoing connections
--net.ipv4.tcp_ecn = 1
--
- # Enable hard and soft link protection
- fs.protected_hardlinks = 1
- fs.protected_symlinks = 1
--- 
-2.7.4
-
meta/recipes-core/systemd/systemd/0001-Use-getenv-when-secure-versions-are-not-available.patch +10 -11
index 03f6ead..3797975 100644
@@ -1,7 +1,7 @@
-From 6dd136512896979feb6883a16226d640a7e5ca74 Mon Sep 17 00:00:00 2001
+From b8055a61b5df6b43b8d3117936587b874b0a339b Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
-Date: Fri, 23 Feb 2018 10:04:48 +0800
-Subject: [PATCH 01/19] Use getenv when secure versions are not available
+Date: Mon, 25 Feb 2019 11:01:18 +0800
+Subject: [PATCH 01/24] Use getenv when secure versions are not available
 
 musl doesnt implement secure version, so we default
 to it if configure does not detect a secure implementation
@@ -12,14 +12,14 @@ Upstream-Status: Denied
 
 Signed-off-by: Chen Qi <[email protected]>
 ---
- src/basic/missing.h | 2 +-
+ src/basic/missing_stdlib.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 71a07d057..0e33abb9f 100644
---- a/src/basic/missing.h
-+++ b/src/basic/missing.h
-@@ -592,7 +592,7 @@ struct btrfs_ioctl_quota_ctl_args {
+diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h
+index 188a8d4..c0ffe86 100644
+--- a/src/basic/missing_stdlib.h
++++ b/src/basic/missing_stdlib.h
+@@ -8,6 +8,6 @@
  #  if HAVE___SECURE_GETENV
  #    define secure_getenv __secure_getenv
  #  else
@@ -27,7 +27,6 @@ index 71a07d057..0e33abb9f 100644
 +#    define secure_getenv getenv
  #  endif
  #endif
- 
 -- 
-2.11.0
+2.7.4
 
meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +11 -11
index e24e7f8..00670ca 100644
@@ -1,7 +1,7 @@
-From 87dd61be2e28e78ce4f9f173794812e6c2d904d1 Mon Sep 17 00:00:00 2001
+From 98254e4798e79d52ac6b562616cd244120f6e239 Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
-Date: Wed, 27 Jun 2018 16:01:22 +0800
-Subject: [PATCH 1/9] binfmt: Don't install dependency links at install time 
+Date: Thu, 21 Feb 2019 16:23:24 +0800
+Subject: [PATCH 1/5] binfmt: Don't install dependency links at install time 
  for the binfmt services
 
 use [Install] blocks so that they get created when the service is enabled
@@ -23,10 +23,10 @@ Signed-off-by: Chen Qi <[email protected]>
  3 files changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/units/meson.build b/units/meson.build
-index e4ac6ced6..698734e44 100644
+index d695084..7b1f14a 100644
 --- a/units/meson.build
 +++ b/units/meson.build
-@@ -46,8 +46,7 @@ units = [
+@@ -47,8 +47,7 @@ units = [
          ['poweroff.target',                     '',
           'runlevel0.target'],
          ['printer.target',                      ''],
@@ -36,18 +36,18 @@ index e4ac6ced6..698734e44 100644
          ['proc-sys-fs-binfmt_misc.mount',       'ENABLE_BINFMT'],
          ['reboot.target',                       '',
           'runlevel6.target ctrl-alt-del.target'],
-@@ -130,8 +129,7 @@ in_units = [
+@@ -134,8 +133,7 @@ in_units = [
          ['systemd-ask-password-console.service', ''],
          ['systemd-ask-password-wall.service',    ''],
          ['[email protected]',           'ENABLE_BACKLIGHT'],
 -        ['systemd-binfmt.service',               'ENABLE_BINFMT',
 -         'sysinit.target.wants/'],
 +        ['systemd-binfmt.service',               'ENABLE_BINFMT'],
+         ['systemd-bless-boot.service',           'ENABLE_EFI HAVE_BLKID'],
+         ['systemd-boot-check-no-failures.service', ''],
          ['[email protected]',            'ENABLE_COREDUMP'],
-         ['systemd-exit.service',                 ''],
-         ['systemd-firstboot.service',            'ENABLE_FIRSTBOOT',
 diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
-index 30a6bc991..4231f3b70 100644
+index 30a6bc9..4231f3b 100644
 --- a/units/proc-sys-fs-binfmt_misc.automount
 +++ b/units/proc-sys-fs-binfmt_misc.automount
 @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/
@@ -58,7 +58,7 @@ index 30a6bc991..4231f3b70 100644
 +[Install]
 +WantedBy=sysinit.target
 diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
-index e940c7c9a..6be7f5cc9 100644
+index e940c7c..6be7f5c 100644
 --- a/units/systemd-binfmt.service.in
 +++ b/units/systemd-binfmt.service.in
 @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
@@ -77,5 +77,5 @@ index e940c7c9a..6be7f5cc9 100644
 +[Install]
 +WantedBy=sysinit.target
 -- 
-2.11.0
+2.7.4
 
meta/recipes-core/systemd/systemd/0001-chown-recursive-let-s-rework-the-recursive-logic-to-.patch deleted +0 -219

219 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-core-when-deserializing-state-always-use-read_line-L.patch deleted +0 -250

250 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch deleted +0 -39
deleted file mode 100644
index 0c912f2..0000000
@@ -1,39 +0,0 @@
-From a2622b8398ba026faf481f5eddeb53231d9de4a7 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <[email protected]>
-Date: Fri, 19 Oct 2018 12:12:33 +0200
-Subject: [PATCH] dhcp6: make sure we have enough space for the DHCP6 option
- header
-
-Fixes a vulnerability originally discovered by Felix Wilhelm from
-Google.
-
-CVE-2018-15688
-LP: #1795921
-https://bugzilla.redhat.com/show_bug.cgi?id=1639067
-
-(cherry picked from commit 4dac5eaba4e419b29c97da38a8b1f82336c2c892)
-
-CVE: CVE-2018-15688
-Upstream-Status: Backport
-
-Signed-off-by: Chen Qi <[email protected]>
----
- src/libsystemd-network/dhcp6-option.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
-index c4b402b..dcbaad0 100644
---- a/src/libsystemd-network/dhcp6-option.c
-+++ b/src/libsystemd-network/dhcp6-option.c
-@@ -103,7 +103,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, DHCP6IA *ia) {
-                 return -EINVAL;
-         }
- 
--        if (*buflen < len)
-+        if (*buflen < offsetof(DHCP6Option, data) + len)
-                 return -ENOBUFS;
- 
-         ia_hdr = *buf;
--- 
-2.7.4
-
meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch new file +523 -0

523 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-login-use-parse_uid-when-unmounting-user-runtime-dir.patch deleted +0 -110

110 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-meson-rename-Ddebug-to-Ddebug-extra.patch deleted +0 -45

45 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-sd-bus-make-BUS_DEFAULT_TIMEOUT-configurable.patch deleted +0 -175

175 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-sysctl-Don-t-pass-null-directive-argument-to-s.patch deleted +0 -31
deleted file mode 100644
index 0538c7b..0000000
@@ -1,31 +0,0 @@
-From bfc4183ea995f1c211385d066cdb1fe9ce89f621 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 16 Dec 2018 20:53:38 -0800
-Subject: [PATCH 1/2] sysctl: Don't pass null directive argument to '%s'
-
-value pointer here is always NULL but  subsequent use of that pointer
-with a %s format will always be NULL, printing p instead would be a
-valid string
-
-Signed-off-by: Khem Raj <[email protected]>
----
-Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/11179]
- src/sysctl/sysctl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index 1cfe51018..c67d79032 100644
---- a/src/sysctl/sysctl.c
-+++ b/src/sysctl/sysctl.c
-@@ -115,7 +115,7 @@ static int parse_file(OrderedHashmap *sysctl_options, const char *path, bool ign
- 
-                 value = strchr(p, '=');
-                 if (!value) {
--                        log_error("Line is not an assignment at '%s:%u': %s", path, c, value);
-+                        log_error("Line is not an assignment at '%s:%u': %s", path, c, p);
- 
-                         if (r == 0)
-                                 r = -EINVAL;
--- 
-2.20.1
-
meta/recipes-core/systemd/systemd/0001-timesync-changes-type-of-drift_freq-to-int64_t.patch deleted +0 -49

49 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0002-core-Fix-use-after-free-case-in-load_from_path.patch deleted +0 -43

43 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +106 -125

261 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch +7 -7
index 1d7f523..df5506c 100644
@@ -1,7 +1,7 @@
-From 6e62be87a2722fbe531310a1b052c1301bdf06fb Mon Sep 17 00:00:00 2001
+From bdbafe18c3bf99b3b691cd52b9ccff60f313892d Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Wed, 27 Jun 2018 16:09:24 +0800
-Subject: [PATCH 2/9] use lnr wrapper instead of looking for --relative option
+Subject: [PATCH 2/5] use lnr wrapper instead of looking for --relative option
  for ln
 
 Remove file manually to avoid the 'File Exists' error when creating
@@ -18,10 +18,10 @@ Signed-off-by: Chen Qi <[email protected]>
  3 files changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 04331dd41..6d5edcb4e 100644
+index 56c98b9..3386546 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -558,10 +558,6 @@ endforeach
+@@ -630,10 +630,6 @@ endforeach
  
  conf.set_quoted('TELINIT', get_option('telinit-path'))
  
@@ -33,7 +33,7 @@ index 04331dd41..6d5edcb4e 100644
  
  gperf = find_program('gperf')
 diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
-index 501cd43d4..f4e4ac9ac 100755
+index 501cd43..f4e4ac9 100755
 --- a/tools/meson-make-symlink.sh
 +++ b/tools/meson-make-symlink.sh
 @@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")"
@@ -45,7 +45,7 @@ index 501cd43d4..f4e4ac9ac 100755
 +        lnr "${DESTDIR:-}$1" "${DESTDIR:-}$2"
  fi
 diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
-index 70f7172ae..a42666aac 100755
+index e2b2603..210d604 100755
 --- a/units/meson-add-wants.sh
 +++ b/units/meson-add-wants.sh
 @@ -25,4 +25,9 @@ case "$target" in
@@ -60,5 +60,5 @@ index 70f7172ae..a42666aac 100755
 +        lnr "$unitpath" "$dir"
 +fi
 -- 
-2.11.0
+2.7.4
 
meta/recipes-core/systemd/systemd/0003-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch deleted +0 -40
deleted file mode 100644
index 115fb33..0000000
@@ -1,40 +0,0 @@
-From e965e748c7030df0709e63128db2f023540a06ba Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 12 Sep 2015 18:53:31 +0000
-Subject: [PATCH 03/19] comparison_fn_t is glibc specific, use raw signature in
- function pointer
-
-make it work with musl where comparison_fn_t is not provided
-
-Upstream-Status: Inappropriate [musl specific]
-
-Signed-off-by: Khem Raj <[email protected]>
----
- src/basic/util.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/basic/util.h b/src/basic/util.h
-index 40eaf518c..c58392397 100644
---- a/src/basic/util.h
-+++ b/src/basic/util.h
-@@ -77,7 +77,7 @@ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-  * that only if nmemb > 0.
-  */
- static inline void* bsearch_safe(const void *key, const void *base,
--                                 size_t nmemb, size_t size, comparison_fn_t compar) {
-+                                 size_t nmemb, size_t size, int (*compar)(const void *, const void *)) {
-         if (nmemb <= 0)
-                 return NULL;
- 
-@@ -89,7 +89,7 @@ static inline void* bsearch_safe(const void *key, const void *base,
-  * Normal qsort requires base to be nonnull. Here were require
-  * that only if nmemb > 0.
-  */
--static inline void qsort_safe(void *base, size_t nmemb, size_t size, comparison_fn_t compar) {
-+static inline void qsort_safe(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)) {
-         if (nmemb <= 1)
-                 return;
- 
--- 
-2.11.0
-
meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch +4 -4
index 6c595ae..6695d56 100644
@@ -1,7 +1,7 @@
-From 0fcb6e646401205e17cc6c129441a49023c62cef Mon Sep 17 00:00:00 2001
+From 47864989388bcd04d647ecf618ad7e260399dbb6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Sat, 5 Sep 2015 06:31:47 +0000
-Subject: [PATCH 3/9] implment systemd-sysv-install for OE
+Subject: [PATCH 3/5] implment systemd-sysv-install for OE
 
 Use update-rc.d for enabling/disabling and status command
 to check the status of the sysv service
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON
-index 8c16cf999..9f078a121 100755
+index 8c16cf9..9f078a1 100755
 --- a/src/systemctl/systemd-sysv-install.SKELETON
 +++ b/src/systemctl/systemd-sysv-install.SKELETON
 @@ -32,17 +32,17 @@ case "$1" in
@@ -39,5 +39,5 @@ index 8c16cf999..9f078a121 100755
      *)
          usage ;;
 -- 
-2.11.0
+2.7.4
 
meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch new file +61 -0

61 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch +17 -16
index 7652a2d..bb738e2 100644
@@ -1,7 +1,7 @@
-From 582af7ec13131dfcc620ed81de7b211914c4cb03 Mon Sep 17 00:00:00 2001
+From 7bcf3b166694090497a0acd2c5299e4e04fcc9b6 Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
-Date: Fri, 29 Jun 2018 13:43:49 +0800
-Subject: [PATCH 04/19] add fallback parse_printf_format implementation
+Date: Mon, 25 Feb 2019 14:04:21 +0800
+Subject: [PATCH 04/24] add fallback parse_printf_format implementation
 
 Upstream-Status: Inappropriate [musl specific]
 
@@ -20,25 +20,25 @@ Signed-off-by: Chen Qi <[email protected]>
  create mode 100644 src/basic/parse-printf-format.h
 
 diff --git a/meson.build b/meson.build
-index e045b9224..8c16bc979 100644
+index 3386546..44b24ee 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -598,6 +598,7 @@ foreach header : ['crypt.h',
-                   'linux/btrfs.h',
+@@ -667,6 +667,7 @@ foreach header : ['crypt.h',
                    'linux/memfd.h',
                    'linux/vm_sockets.h',
+                   'linux/can/vxcan.h',
 +                  'printf.h',
                    'sys/auxv.h',
                    'valgrind/memcheck.h',
                    'valgrind/valgrind.h',
 diff --git a/src/basic/meson.build b/src/basic/meson.build
-index 31625b178..0c27528e7 100644
+index e5852f3..2192a0c 100644
 --- a/src/basic/meson.build
 +++ b/src/basic/meson.build
-@@ -302,6 +302,11 @@ foreach item : [['af',     af_list_txt,     'af',         ''],
+@@ -284,6 +284,11 @@ foreach item : [['af',     af_list_txt,     'af',         ''],
  endforeach
  
- basic_sources += [missing_h] + generated_gperf_headers
+ basic_sources += generated_gperf_headers
 +
 +if conf.get('HAVE_PRINTF_H') != 1
 +        basic_sources += [files('parse-printf-format.c')]
@@ -49,7 +49,7 @@ index 31625b178..0c27528e7 100644
          'gcrypt-util.h')
 diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c
 new file mode 100644
-index 000000000..49437e544
+index 0000000..49437e5
 --- /dev/null
 +++ b/src/basic/parse-printf-format.c
 @@ -0,0 +1,273 @@
@@ -328,7 +328,7 @@ index 000000000..49437e544
 +}
 diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h
 new file mode 100644
-index 000000000..47be7522d
+index 0000000..47be752
 --- /dev/null
 +++ b/src/basic/parse-printf-format.h
 @@ -0,0 +1,57 @@
@@ -390,10 +390,10 @@ index 000000000..47be7522d
 +
 +#endif /* HAVE_PRINTF_H */
 diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
-index 73c03274c..30192cd71 100644
+index dc67b6e..cf8d514 100644
 --- a/src/basic/stdio-util.h
 +++ b/src/basic/stdio-util.h
-@@ -1,12 +1,12 @@
+@@ -1,13 +1,13 @@
  /* SPDX-License-Identifier: LGPL-2.1+ */
  #pragma once
  
@@ -403,12 +403,13 @@ index 73c03274c..30192cd71 100644
  #include <sys/types.h>
  
  #include "macro.h"
+ #include "util.h"
 +#include "parse-printf-format.h"
  
  #define snprintf_ok(buf, len, fmt, ...) \
          ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len))
 diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
-index a0621524a..65bcbcd2e 100644
+index 8618454..3fea912 100644
 --- a/src/journal/journal-send.c
 +++ b/src/journal/journal-send.c
 @@ -2,7 +2,6 @@
@@ -420,13 +421,13 @@ index a0621524a..65bcbcd2e 100644
  #include <sys/socket.h>
  #include <sys/un.h>
 @@ -21,6 +20,7 @@
- #include "stdio-util.h"
  #include "string-util.h"
+ #include "tmpfile-util.h"
  #include "util.h"
 +#include "parse-printf-format.h"
  
  #define SNDBUF_SIZE (8*1024*1024)
  
 -- 
-2.11.0
+2.7.4
 
meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch +10 -8
index 7e37cbc..738f8eb 100644
@@ -1,7 +1,7 @@
-From 5d8128f3832fd11fd046d1d1ad86c4ee7bc1dff0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 9 Nov 2016 19:41:13 -0800
-Subject: [PATCH 4/9] rules: whitelist hd* devices
+From dc0a6a9fe4da9738efaba942233ad39da625a918 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Thu, 21 Feb 2019 16:28:21 +0800
+Subject: [PATCH 4/5] rules: whitelist hd* devices
 
 qemu by default emulates IDE and the linux-yocto kernel(s) use
 CONFIG_IDE instead of the more modern libsata, so disks appear as
@@ -11,23 +11,25 @@ Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276]
 
 Signed-off-by: Patrick Ohly <[email protected]>
 Signed-off-by: Khem Raj <[email protected]>
+[rebased for systemd 241]
+Signed-off-by: Chen Qi <[email protected]>
 ---
  rules/60-persistent-storage.rules | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index 8ddb7577c..811e948ad 100644
+index 1d8880e..e53c8ea 100644
 --- a/rules/60-persistent-storage.rules
 +++ b/rules/60-persistent-storage.rules
 @@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end"
  ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end"
  
  SUBSYSTEM!="block", GOTO="persistent_storage_end"
--KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*", GOTO="persistent_storage_end"
-+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*|hd*", GOTO="persistent_storage_end"
+-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end"
++KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*|zd*|hd*", GOTO="persistent_storage_end"
  
  # ignore partitions that span the entire disk
  TEST=="whole_disk", GOTO="persistent_storage_end"
 -- 
-2.11.0
+2.7.4
 
meta/recipes-core/systemd/systemd/0005-Make-root-s-home-directory-configurable.patch deleted +0 -70

70 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0005-basic-user-util-properly-protect-use-of-gshadow.patch deleted +0 -38
deleted file mode 100644
index 518c05b..0000000
@@ -1,38 +0,0 @@
-From 66a5b5ce9b991327d594f7b635de16999ca54093 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <[email protected]>
-Date: Wed, 21 Nov 2018 18:09:04 +0100
-Subject: basic/user-util: properly protect use of gshadow
-
-Commit 100d5f6ee6 (user-util: add new wrappers for [...] database
-files), ammended by commit 4f07ffa8f5 (Use #if instead of #ifdef for
-ENABLE_GSHADOW) moved code from sysuser to basic/user-util.
-
-In doing so, the combination of both commits properly propagated the
-ENABLE_GSHADOW conditions around the function manipulating gshadow, but
-they forgot to protect the inclusion of the gshadow.h header.
-
-Fix that to be able to build on C libraries that do not provide gshadow
-(e.g. uClibc-ng, where it does not exist.)
-
-Upstream-Status: Backport [https://github.com/systemd/systemd/commit/66a5b5ce9b991327d594f7b635de16999ca54093]
----
- src/basic/user-util.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/basic/user-util.h b/src/basic/user-util.h
-index b6de0e423..cc899ee76 100644
---- a/src/basic/user-util.h
-+++ b/src/basic/user-util.h
-@@ -2,7 +2,9 @@
- #pragma once
- 
- #include <grp.h>
-+#if ENABLE_GSHADOW
- #include <gshadow.h>
-+#endif
- #include <pwd.h>
- #include <shadow.h>
- #include <stdbool.h>
--- 
-2.18.1
-
meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch renamed from meta/recipes-core/systemd/systemd/0007-rules-watch-metadata-changes-in-ide-devices.patch +10 -8
similarity index 78%
rename from meta/recipes-core/systemd/systemd/0007-rules-watch-metadata-changes-in-ide-devices.patch
rename to meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch
index a5f65e6..2123052 100644
@@ -1,7 +1,7 @@
-From 9302b72e5e69512aaa7106197b00c55baeb35b3c Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Fri, 17 Nov 2017 09:46:00 +0800
-Subject: [PATCH 7/9] rules: watch metadata changes in ide devices
+From d1bccc721dd8f43fee29c5df0e9b78345e69f4b6 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Thu, 21 Feb 2019 16:38:38 +0800
+Subject: [PATCH 5/5] rules: watch metadata changes in ide devices
 
 Formatting IDE storage does not trigger "change" uevents. As a result
 clients using udev API don't get any updates afterwards and get outdated
@@ -24,20 +24,22 @@ CONFIG_IDE instead of the more modern libsata, so disks appear as
 is deprecated.
 
 Signed-off-by: Hongxu Jia <[email protected]>
+[rebased for systemd 241]
+Signed-off-by: Chen Qi <[email protected]>
 ---
  rules/60-block.rules | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/rules/60-block.rules b/rules/60-block.rules
-index 343fc06f8..b5237dac4 100644
+index a1458e9..3ba4b6b4 100644
 --- a/rules/60-block.rules
 +++ b/rules/60-block.rules
 @@ -8,4 +8,4 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_
  ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change"
  
  # watch metadata changes, caused by tools closing the device node which was opened for writing
--ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*", OPTIONS+="watch"
-+ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|hd*", OPTIONS+="watch"
+-ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|dasd*", OPTIONS+="watch"
++ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|dasd*|hd*", OPTIONS+="watch"
 -- 
-2.11.0
+2.7.4
 
meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch renamed from meta/recipes-core/systemd/systemd/0006-src-basic-missing.h-check-for-missing-strndupa.patch +44 -46

147 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch renamed from meta/recipes-core/systemd/systemd/0007-Include-netinet-if_ether.h.patch +14 -14
similarity index 85%
rename from meta/recipes-core/systemd/systemd/0007-Include-netinet-if_ether.h.patch
rename to meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
index 2df8cf9..b41f6c7 100644
@@ -1,7 +1,7 @@
-From aab90d0dfa934d33879eaec1a878e93b201d33f1 Mon Sep 17 00:00:00 2001
+From 67a988ae82c776d11be76de7180d50ea027ac442 Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
-Date: Fri, 29 Jun 2018 16:44:43 +0800
-Subject: [PATCH 07/19] Include netinet/if_ether.h
+Date: Mon, 25 Feb 2019 14:24:20 +0800
+Subject: [PATCH 06/24] Include netinet/if_ether.h
 
 Fixes
 /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr'
@@ -22,7 +22,7 @@ Signed-off-by: Chen Qi <[email protected]>
  6 files changed, 6 insertions(+)
 
 diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
-index c93fe9cb4..2013d06e1 100644
+index 9dcd3f2..e23ff4c 100644
 --- a/src/libsystemd/sd-netlink/netlink-types.c
 +++ b/src/libsystemd/sd-netlink/netlink-types.c
 @@ -3,6 +3,7 @@
@@ -34,7 +34,7 @@ index c93fe9cb4..2013d06e1 100644
  #include <linux/rtnetlink.h>
  #include <linux/genetlink.h>
 diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c
-index 21fb7ab06..0afe5170c 100644
+index 951138d..1ad499d 100644
 --- a/src/network/netdev/tuntap.c
 +++ b/src/network/netdev/tuntap.c
 @@ -2,6 +2,7 @@
@@ -46,7 +46,7 @@ index 21fb7ab06..0afe5170c 100644
  #include <net/if.h>
  #include <netinet/if_ether.h>
 diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
-index 8e8a618e2..52d523a67 100644
+index 8377623..132af60 100644
 --- a/src/network/networkd-brvlan.c
 +++ b/src/network/networkd-brvlan.c
 @@ -4,6 +4,7 @@
@@ -58,7 +58,7 @@ index 8e8a618e2..52d523a67 100644
  #include <stdbool.h>
  
 diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c
-index 4bb4216ac..5f7383483 100644
+index 0dcec03..3695b10 100644
 --- a/src/udev/net/ethtool-util.c
 +++ b/src/udev/net/ethtool-util.c
 @@ -1,5 +1,6 @@
@@ -69,28 +69,28 @@ index 4bb4216ac..5f7383483 100644
  #include <sys/ioctl.h>
  #include <linux/ethtool.h>
 diff --git a/src/udev/net/ethtool-util.h b/src/udev/net/ethtool-util.h
-index 064bf4d2b..ee0d4fb2a 100644
+index 618b26b..ebfe82a 100644
 --- a/src/udev/net/ethtool-util.h
 +++ b/src/udev/net/ethtool-util.h
-@@ -3,6 +3,7 @@
- 
+@@ -2,6 +2,7 @@
+ #pragma once
  
  #include <macro.h>
 +#include <netinet/if_ether.h>
  #include <linux/ethtool.h>
  
- #include "missing.h"
+ #include "conf-parser.h"
 diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c
-index 8bed6399a..a3a96959b 100644
+index a845dfa..177289a 100644
 --- a/src/udev/udev-builtin-net_setup_link.c
 +++ b/src/udev/udev-builtin-net_setup_link.c
 @@ -1,5 +1,6 @@
  /* SPDX-License-Identifier: LGPL-2.1+ */
  
 +#include <netinet/if_ether.h>
+ #include "device-util.h"
  #include "alloc-util.h"
  #include "link-config.h"
- #include "log.h"
 -- 
-2.11.0
+2.7.4
 
meta/recipes-core/systemd/systemd/0006-remove-nobody-user-group-checking.patch deleted +0 -63

63 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch renamed from meta/recipes-core/systemd/systemd/0008-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch +25 -24

123 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0008-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch deleted +0 -29
deleted file mode 100644
index abecdc7..0000000
@@ -1,29 +0,0 @@
-From b6ba596fd1313a162cdc2eb88161dcf24d19ede7 Mon Sep 17 00:00:00 2001
-From: Chen Qi <[email protected]>
-Date: Thu, 28 Jun 2018 10:10:02 +0800
-Subject: [PATCH 8/9] Do not enable nss tests if nss-systemd is not enabled
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
-Signed-off-by: Chen Qi <[email protected]>
----
- src/test/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/test/meson.build b/src/test/meson.build
-index 7da7e3a22..7b7c257ff 100644
---- a/src/test/meson.build
-+++ b/src/test/meson.build
-@@ -645,7 +645,7 @@ tests += [
-         [['src/test/test-nss.c'],
-          [],
-          [libdl],
--         '', 'manual'],
-+         'ENABLE_NSS_SYSTEMD', 'manual'],
- 
-         [['src/test/test-umount.c',
-           'src/core/mount-setup.c',
--- 
-2.11.0
-
meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch renamed from meta/recipes-core/systemd/systemd/0009-add-missing-FTW_-macros-for-musl.patch +13 -16
similarity index 50%
rename from meta/recipes-core/systemd/systemd/0009-add-missing-FTW_-macros-for-musl.patch
rename to meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
index 95287cce..d5f2349 100644
@@ -1,7 +1,7 @@
-From acc2c08082795802011e3c5f8626d63210021489 Mon Sep 17 00:00:00 2001
+From 6cd17c753d2c0a90fc791f69bbc694cbc8556a4f Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
-Date: Wed, 28 Feb 2018 21:36:32 -0800
-Subject: [PATCH 09/19] add missing FTW_ macros for musl
+Date: Mon, 25 Feb 2019 15:00:06 +0800
+Subject: [PATCH 08/24] add missing FTW_ macros for musl
 
 This is to avoid build failures like below for musl.
 
@@ -11,17 +11,18 @@ Upstream-Status: Inappropriate [musl specific]
 
 Signed-off-by: Chen Qi <[email protected]>
 ---
- src/basic/missing.h | 20 ++++++++++++++++++++
+ src/basic/missing_type.h | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
-diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 02397f1b6..6dc750eba 100644
---- a/src/basic/missing.h
-+++ b/src/basic/missing.h
-@@ -189,6 +189,26 @@ struct sockaddr_vm {
- #define BTRFS_QGROUP_LEVEL_SHIFT 48
+diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
+index c487e65..23602eb 100644
+--- a/src/basic/missing_type.h
++++ b/src/basic/missing_type.h
+@@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *);
+ #define __COMPAR_FN_T
+ typedef int (*__compar_fn_t)(const void *, const void *);
  #endif
- 
++
 +#ifndef FTW_ACTIONRETVAL
 +#define FTW_ACTIONRETVAL 16
 +#endif
@@ -41,10 +42,6 @@ index 02397f1b6..6dc750eba 100644
 +#ifndef FTW_SKIP_SIBLINGS
 +#define FTW_SKIP_SIBLINGS 3
 +#endif
-+
- #if ! HAVE_LINUX_BTRFS_H
- #define BTRFS_IOC_QGROUP_ASSIGN _IOW(BTRFS_IOCTL_MAGIC, 41, \
-                                struct btrfs_ioctl_qgroup_assign_args)
 -- 
-2.11.0
+2.7.4
 
meta/recipes-core/systemd/systemd/0009-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch deleted +0 -43

43 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch renamed from meta/recipes-core/systemd/systemd/0010-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch +5 -5
similarity index 80%
rename from meta/recipes-core/systemd/systemd/0010-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
rename to meta/recipes-core/systemd/systemd/0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
index 1654798..57cb5f3 100644
@@ -1,7 +1,7 @@
-From a0bd587300744dbb8e9cfbb043233670ce781c98 Mon Sep 17 00:00:00 2001
+From 6a2cadd6b70cb40ac74fc0d0f8557b914bd38ac2 Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Mon, 2 Jul 2018 13:22:41 +0800
-Subject: [PATCH 10/19] socket-util: don't fail if libc doesn't support IDN
+Subject: [PATCH 09/24] socket-util: don't fail if libc doesn't support IDN
 
 Upstream-Status: Inappropriate [musl specific]
 
@@ -13,10 +13,10 @@ Signed-off-by: Chen Qi <[email protected]>
  1 file changed, 10 insertions(+)
 
 diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
-index a913102e1..0d0154805 100644
+index 91bf801..c445fea 100644
 --- a/src/basic/socket-util.c
 +++ b/src/basic/socket-util.c
-@@ -32,6 +32,16 @@
+@@ -33,6 +33,16 @@
  #include "utf8.h"
  #include "util.h"
  
@@ -34,5 +34,5 @@ index a913102e1..0d0154805 100644
  #  define IDN_FLAGS NI_IDN
  #else
 -- 
-2.11.0
+2.7.4
 
meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch renamed from meta/recipes-core/systemd/systemd/0012-fix-missing-of-__register_atfork-for-non-glibc-build.patch +8 -8
similarity index 75%
rename from meta/recipes-core/systemd/systemd/0012-fix-missing-of-__register_atfork-for-non-glibc-build.patch
rename to meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch
index d41bc4a..8bacd02 100644
@@ -1,7 +1,7 @@
-From 1fadf805cb391e3bcbd9a0286a9e4b7adb9e7427 Mon Sep 17 00:00:00 2001
+From f1f4b4f9684fed185bfa8b9ed409cdf241657e99 Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
-Date: Mon, 2 Jul 2018 13:34:09 +0800
-Subject: [PATCH 12/19] fix missing of __register_atfork for non-glibc builds
+Date: Mon, 25 Feb 2019 15:03:47 +0800
+Subject: [PATCH 10/24] fix missing of __register_atfork for non-glibc builds
 
 Upstream-Status: Inappropriate [musl specific]
 
@@ -11,7 +11,7 @@ Signed-off-by: Chen Qi <[email protected]>
  1 file changed, 7 insertions(+)
 
 diff --git a/src/basic/process-util.c b/src/basic/process-util.c
-index 0a4f917cb..3543bc045 100644
+index 78ce43b..aec2daf 100644
 --- a/src/basic/process-util.c
 +++ b/src/basic/process-util.c
 @@ -22,6 +22,9 @@
@@ -24,7 +24,7 @@ index 0a4f917cb..3543bc045 100644
  
  #include "alloc-util.h"
  #include "architecture.h"
-@@ -1150,11 +1153,15 @@ void reset_cached_pid(void) {
+@@ -1160,11 +1163,15 @@ void reset_cached_pid(void) {
          cached_pid = CACHED_PID_UNSET;
  }
  
@@ -32,8 +32,8 @@ index 0a4f917cb..3543bc045 100644
  /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
   * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
   * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle);
- extern void* __dso_handle __attribute__ ((__weak__));
+ extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
+ extern void* __dso_handle _weak_;
 +#else
 +#define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child)
 +#endif
@@ -41,5 +41,5 @@ index 0a4f917cb..3543bc045 100644
  pid_t getpid_cached(void) {
          static bool installed = false;
 -- 
-2.11.0
+2.7.4
 
meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch renamed from meta/recipes-core/systemd/systemd/0013-Use-uintmax_t-for-handling-rlim_t.patch +33 -26

34 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch deleted +0 -48

48 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch new file +27 -0
new file mode 100644
index 0000000..dbaae4f

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0013-test-hexdecoct.c-Include-missing.h-for-strndupa.patch renamed from meta/recipes-core/systemd/systemd/0015-test-hexdecoct.c-Include-missing.h-for-strndupa.patch +4 -4
similarity index 78%
rename from meta/recipes-core/systemd/systemd/0015-test-hexdecoct.c-Include-missing.h-for-strndupa.patch
rename to meta/recipes-core/systemd/systemd/0013-test-hexdecoct.c-Include-missing.h-for-strndupa.patch
index c7ca9cd..874c17c 100644

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0014-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch deleted +0 -30
deleted file mode 100644
index 258a631..0000000

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch renamed from meta/recipes-core/systemd/systemd/0016-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch +6 -6
similarity index 78%
rename from meta/recipes-core/systemd/systemd/0016-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
rename to meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
index c06a370..914589d 100644

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch renamed from meta/recipes-core/systemd/systemd/0017-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +5 -5
similarity index 95%
rename from meta/recipes-core/systemd/systemd/0017-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
rename to meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
index 8e47c6f5..fd407f6 100644

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch renamed from meta/recipes-core/systemd/systemd/0018-Define-glibc-compatible-basename-for-non-glibc-syste.patch +4 -4
similarity index 82%
rename from meta/recipes-core/systemd/systemd/0018-Define-glibc-compatible-basename-for-non-glibc-syste.patch
rename to meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch
index 1bd0d60..d556569 100644

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch renamed from meta/recipes-core/systemd/systemd/0019-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +5 -5
similarity index 82%
rename from meta/recipes-core/systemd/systemd/0019-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
rename to meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
index 942f4c0..05e6ded 100644

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch renamed from meta/recipes-core/systemd/systemd/0020-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +6 -6
similarity index 87%
rename from meta/recipes-core/systemd/systemd/0020-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
rename to meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
index 5c78cab..5901772 100644

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch renamed from meta/recipes-core/systemd/systemd/0021-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch +15 -14
similarity index 49%
rename from meta/recipes-core/systemd/systemd/0021-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
rename to meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
index 668f273..35cc66f 100644

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch new file +30 -0
new file mode 100644
index 0000000..753d511

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch new file +47 -0

47 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0022-Use-if-instead-of-ifdef-for-ENABLE_GSHADOW.patch deleted +0 -28
deleted file mode 100644
index a9c1c9c..0000000

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0022-build-sys-Detect-whether-struct-statx-is-defined-in-.patch deleted +0 -109

109 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0022-include-sys-wait.h-to-avoid-compile-failure.patch new file +33 -0
new file mode 100644
index 0000000..47212bc

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0023-resolvconf-fixes-for-the-compatibility-interface.patch deleted +0 -58

58 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0023-socket-util.h-include-string.h.patch new file +30 -0
new file mode 100644
index 0000000..22186b8

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0024-journald-do-not-store-the-iovec-entry-for-process-co.patch deleted +0 -208

208 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch new file +33 -0
new file mode 100644
index 0000000..c2ae2bb

Lines of this file are not shown. View the raw message.

meta/recipes-core/systemd/systemd/0025-journald-set-a-limit-on-the-number-of-fields.patch deleted +0 -139

139 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0026-journal-fix-out-of-bounds-read-CVE-2018-16866.patch deleted +0 -49

49 lines not on this page · raw message

meta/recipes-core/systemd/systemd/CVE-2019-6454.patch deleted +0 -210

210 lines not on this page · raw message

meta/recipes-core/systemd/systemd/sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch deleted +0 -61

61 lines not on this page · raw message

meta/recipes-core/systemd/systemd_241.bb renamed from meta/recipes-core/systemd/systemd_239.bb +31 -48

79 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.9.1

Part of the diff is not shown here. View the raw message.

author
#4 lore raw

Re: [PATCH 3/3] systemd-boot: upgrade to 241

In reply to Chen Qi
Quoted 44 lines · Chen Qi

The following two patches are added because I cannot figure out how to pass parameter to efi-cc if it's changed to be an array value.

systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch

---
  .../{systemd-boot_239.bb => systemd-boot_241.bb}   | 10 +--
  ...t-meson-print-EFI-CC-configuration-nicely.patch | 33 ++++++++++
  ...vert-meson-use-an-array-option-for-efi-cc.patch | 77 ++++++++++++++++++++++
  3 files changed, 116 insertions(+), 4 deletions(-)

rename meta/recipes-core/systemd/{systemd-boot_239.bb => systemd-boot_241.bb} (85%)
create mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch create mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch

meta/recipes-core/systemd/systemd-boot_241.bb renamed from meta/recipes-core/systemd/systemd-boot_239.bb +5 -3
similarity index 85%
rename from meta/recipes-core/systemd/systemd-boot_239.bb
rename to meta/recipes-core/systemd/systemd-boot_241.bb
index 2450d52..083a864 100644
@@ -3,23 +3,25 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
 
  DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
 
-SRC_URI += "file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \
-            file://0006-remove-nobody-user-group-checking.patch \
+# 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-rename-Ddebug-to-Ddebug-extra.patch \
              "
 
  inherit meson pkgconfig gettext
  inherit deploy
 
  EFI_CC ?= "${CC}"
+
  EXTRA_OEMESON += "-Defi=true \

meta/recipes-core/systemd/systemd-boot_241.bb FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" · line 27

Quoted 10 lines
meta/recipes-core/systemd/systemd-boot_241.bb renamed from meta/recipes-core/systemd/systemd-boot_239.bb +1 -1
                    -Dgnu-efi=true \
                    -Defi-includedir=${STAGING_INCDIR}/efi \
                    -Defi-ldsdir=${STAGING_LIBDIR} \
                    -Defi-libdir=${STAGING_LIBDIR} \
                    -Dman=false \
-                  -Defi-cc='${EFI_CC}' \
+                  -Defi-cc='${CC}' \
                    -Defi-ld='${LD}' \
                    "
 

The above change is not needed.
I've fixed it and updated the remote branch.

git://git.pokylinux.org/poky-contrib ChenQi/systemd-241
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/systemd-241

Best Regards,
Chen Qi

Quoted 122 lines
meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch new file +33 -0
new file mode 100644
index 0000000..ed14e25
@@ -0,0 +1,33 @@
+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 new file +77 -0
new file mode 100644
index 0000000..0d2ebf6
@@ -0,0 +1,77 @@
+From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Tue, 26 Feb 2019 14:17:25 +0800
+Subject: [PATCH] Revert "meson: use an array option for efi-cc"
+
+This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e.
+
+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_options.txt        |  2 +-
+ src/boot/efi/meson.build | 11 ++++++-----
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 044bb79..3d28bfd 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'],
+
+ option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'],
+        description : 'gnu-efi support for sd-boot')
+-option('efi-cc', type : 'array',
++option('efi-cc', type : 'string',
+        description : 'the compiler to use for EFI modules')
+ option('efi-ld', type : 'string',
+        description : 'the linker to use for EFI modules')
+diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
+index 2140151..d8db3a1 100644
+--- a/src/boot/efi/meson.build
++++ b/src/boot/efi/meson.build
+@@ -34,8 +34,8 @@ stub_sources = '''
+
+ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false'
+         efi_cc = get_option('efi-cc')
+-        if efi_cc.length() == 0
+-                efi_cc = cc.cmd_array()
++        if efi_cc == ''
++                efi_cc = ' '.join(cc.cmd_array())
+         endif
+         efi_ld = get_option('efi-ld')
+         if efi_ld == ''
+@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false'
+
+         efi_libdir = get_option('efi-libdir')
+         if efi_libdir == ''
+-                ret = run_command(efi_cc + ['-print-multi-os-directory'])
++                cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc)
++                ret = run_command('sh', '-c', cmd)
+                 if ret.returncode() == 0
+                         path = join_paths('/usr/lib', ret.stdout().strip())
+                         ret = run_command('realpath', '-e', path)
+@@ -152,7 +153,7 @@ if have_gnu_efi
+                 o_file = custom_target(file + '.o',
+                                        input : file,
+                                        output : file + '.o',
+-                                       command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@']
++                                       command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@']
+                                                  + compile_args,
+                                        depend_files : efi_headers)
+                 if (common_sources + systemd_boot_sources).contains(file)
+@@ -163,7 +164,7 @@ if have_gnu_efi
+                 endif
+         endforeach
+
+-        libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip()
++        libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip()
+         systemd_boot_efi_name = 'systemd-boot@[email protected]'.format(EFI_MACHINE_TYPE_NAME)
+         stub_efi_name = 'linux@[email protected]'.format(EFI_MACHINE_TYPE_NAME)
+         no_undefined_symbols = find_program('no-undefined-symbols.sh')
+--
+2.7.4
+
#5 lore raw
In reply to Chen Qi
Quoted 8 lines · Chen Qi

The following changes since commit 4d275d97b6c572fe11668ac16d2c77c018340c7c:

perl: apply a native-only patch only to -native (2019-02-28 17:49:40 +0000)

are available in the git repository at:

Quoted 8 lines

git://git.pokylinux.org/poky-contrib ChenQi/systemd-241
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/systemd-241

Chen Qi (3):
systemd: upgrade to 241
systemd-conf: add version info in recipe name
systemd-boot: upgrade to 241

This upgrade seems to cause problems with the on-disk timestamp for systemd-timesyncd. Having started writing what goes on, it's actually in the systemd NEWS for 240:

* DynamicUser=yes is dropped from systemd-networkd.service, systemd-resolved.service and systemd-timesyncd.service, which was enabled in v239 for systemd-networkd.service and systemd-resolved.service, and since v236 for systemd-timesyncd.service. The users and groups systemd-network, systemd-resolve and systemd-timesync are created by systemd-sysusers again. Distributors or system administrators may need to create these users and groups if they not exist (or need to re-enable DynamicUser= for those units) while upgrading systemd. Also, the clock file for systemd-timesyncd may need to move from /var/lib/private/systemd/timesync/clock to /var/lib/systemd/timesync/clock.

It's the last bit that's tripping things up. I'm not sure I can think of a good way of expressing that fixup using tmpfiles. I can use a ConditionNeedsUpdate=/var to catch it locally (I'm using OSTree, and OSTree successfully triggers that), but I don't know how useful that approach will be to others.

Signature · 1 line
Alex Kiernan
#6 lore raw
In reply to Chen Qi

| src/boot/efi/meson.build:63:24: ERROR: Program or command 'realpath' not found or not executable

Fails if you turn on EFI.

Ross

Quoted 144 lines · Chen Qi

The following changes since commit 4d275d97b6c572fe11668ac16d2c77c018340c7c:

perl: apply a native-only patch only to -native (2019-02-28 17:49:40 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/systemd-241
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/systemd-241

Chen Qi (3):
systemd: upgrade to 241
systemd-conf: add version info in recipe name
systemd-boot: upgrade to 241

 .../{systemd-boot_239.bb => systemd-boot_241.bb}   |  10 +-
 .../{systemd-conf.bb => systemd-conf_241.bb}       |   0
 meta/recipes-core/systemd/systemd.inc              |   2 +-
 ...ck-protector-flags-to-workaround-musl-bui.patch |  33 --
 ...t-meson-print-EFI-CC-configuration-nicely.patch |  33 ++
 ...vert-meson-use-an-array-option-for-efi-cc.patch |  77 +++
 ...tl.d-request-ECN-on-both-in-and-outgoing-.patch |  36 --
 ...nv-when-secure-versions-are-not-available.patch |  21 +-
 ...t-install-dependency-links-at-install-tim.patch |  22 +-
 ...sive-let-s-rework-the-recursive-logic-to-.patch | 219 ---------
 ...eserializing-state-always-use-read_line-L.patch | 250 ----------
 ...sure-we-have-enough-space-for-the-DHCP6-o.patch |  39 --
 ...01-do-not-disable-buffer-in-writing-files.patch | 523 +++++++++++++++++++++
 ...arse_uid-when-unmounting-user-runtime-dir.patch | 110 -----
 .../0001-meson-rename-Ddebug-to-Ddebug-extra.patch |  45 --
 ...bus-make-BUS_DEFAULT_TIMEOUT-configurable.patch | 175 -------
 ...l-Don-t-pass-null-directive-argument-to-s.patch |  31 --
 ...ync-changes-type-of-drift_freq-to-int64_t.patch |  49 --
 ...Fix-use-after-free-case-in-load_from_path.patch |  43 --
 .../0002-don-t-use-glibc-specific-qsort_r.patch    | 231 +++++----
 ...pper-instead-of-looking-for-relative-opti.patch |  14 +-
 ...fn_t-is-glibc-specific-use-raw-signature-.patch |  40 --
 ...0003-implment-systemd-sysv-install-for-OE.patch |   8 +-
 ...e.h-add-__compare_fn_t-and-comparison_fn_.patch |  61 +++
 ...llback-parse_printf_format-implementation.patch |  33 +-
 .../systemd/0004-rules-whitelist-hd-devices.patch  |  18 +-
 ...5-Make-root-s-home-directory-configurable.patch |  70 ---
 ...user-util-properly-protect-use-of-gshadow.patch |  38 --
 ...es-watch-metadata-changes-in-ide-devices.patch} |  18 +-
 ...sic-missing.h-check-for-missing-strndupa.patch} |  90 ++--
 ...patch => 0006-Include-netinet-if_ether.h.patch} |  28 +-
 .../0006-remove-nobody-user-group-checking.patch   |  63 ---
 ...if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch} |  49 +-
 ...le-nss-tests-if-nss-systemd-is-not-enable.patch |  29 --
 ...=> 0008-add-missing-FTW_-macros-for-musl.patch} |  29 +-
 ...nes-Build-conditionally-when-ENABLE_MYHOS.patch |  43 --
 ...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} |  10 +-
 ...of-__register_atfork-for-non-glibc-build.patch} |  16 +-
 ...> 0011-Use-uintmax_t-for-handling-rlim_t.patch} |  59 ++-
 ...issing.h-check-for-missing-__compar_fn_t-.patch |  48 --
 ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch |  27 ++
 ...xdecoct.c-Include-missing.h-for-strndupa.patch} |   8 +-
 ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch |  30 --
 ...c-Disable-tests-for-missing-typedefs-in-.patch} |  12 +-
 ...ss-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} |  10 +-
 ...-compatible-basename-for-non-glibc-syste.patch} |   8 +-
 ...le-buffering-when-writing-to-oom_score_a.patch} |  10 +-
 ...XSI-compliant-strerror_r-from-GNU-specif.patch} |  12 +-
 ...t_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch} |  29 +-
 ...ing_type.h-add-__compar_d_fn_t-definition.patch |  30 ++
 ...id-redefinition-of-prctl_mm_map-structure.patch |  47 ++
 ...se-if-instead-of-ifdef-for-ENABLE_GSHADOW.patch |  28 --
 ...etect-whether-struct-statx-is-defined-in-.patch | 109 -----
 ...clude-sys-wait.h-to-avoid-compile-failure.patch |  33 ++
 ...onf-fixes-for-the-compatibility-interface.patch |  58 ---
 .../0023-socket-util.h-include-string.h.patch      |  30 ++
 ...-not-store-the-iovec-entry-for-process-co.patch | 208 --------
 .../systemd/0024-test-json.c-define-M_PIl.patch    |  33 ++
 ...rnald-set-a-limit-on-the-number-of-fields.patch | 139 ------
 ...nal-fix-out-of-bounds-read-CVE-2018-16866.patch |  49 --
 .../systemd/systemd/CVE-2019-6454.patch            | 210 ---------
 ...e-receive-an-invalid-dbus-message-ignore-.patch |  61 ---
 .../systemd/{systemd_239.bb => systemd_241.bb}     |  79 ++--
 63 files changed, 1294 insertions(+), 2679 deletions(-)
 rename meta/recipes-core/systemd/{systemd-boot_239.bb => systemd-boot_241.bb} (85%)
 rename meta/recipes-core/systemd/{systemd-conf.bb => systemd-conf_241.bb} (100%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch
 create 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-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-chown-recursive-let-s-rework-the-recursive-logic-to-.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-core-when-deserializing-state-always-use-read_line-L.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-login-use-parse_uid-when-unmounting-user-runtime-dir.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-rename-Ddebug-to-Ddebug-extra.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-sd-bus-make-BUS_DEFAULT_TIMEOUT-configurable.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-sysctl-Don-t-pass-null-directive-argument-to-s.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-timesync-changes-type-of-drift_freq-to-int64_t.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0002-core-Fix-use-after-free-case-in-load_from_path.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0003-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0005-Make-root-s-home-directory-configurable.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0005-basic-user-util-properly-protect-use-of-gshadow.patch
 rename meta/recipes-core/systemd/systemd/{0007-rules-watch-metadata-changes-in-ide-devices.patch => 0005-rules-watch-metadata-changes-in-ide-devices.patch} (78%)
 rename meta/recipes-core/systemd/systemd/{0006-src-basic-missing.h-check-for-missing-strndupa.patch => 0005-src-basic-missing.h-check-for-missing-strndupa.patch} (65%)
 rename meta/recipes-core/systemd/systemd/{0007-Include-netinet-if_ether.h.patch => 0006-Include-netinet-if_ether.h.patch} (85%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0006-remove-nobody-user-group-checking.patch
 rename meta/recipes-core/systemd/systemd/{0008-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch} (81%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0008-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
 rename meta/recipes-core/systemd/systemd/{0009-add-missing-FTW_-macros-for-musl.patch => 0008-add-missing-FTW_-macros-for-musl.patch} (50%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0009-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
 rename meta/recipes-core/systemd/systemd/{0010-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch => 0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch} (80%)
 rename meta/recipes-core/systemd/systemd/{0012-fix-missing-of-__register_atfork-for-non-glibc-build.patch => 0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch} (75%)
 rename meta/recipes-core/systemd/systemd/{0013-Use-uintmax_t-for-handling-rlim_t.patch => 0011-Use-uintmax_t-for-handling-rlim_t.patch} (62%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
 rename meta/recipes-core/systemd/systemd/{0015-test-hexdecoct.c-Include-missing.h-for-strndupa.patch => 0013-test-hexdecoct.c-Include-missing.h-for-strndupa.patch} (78%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0014-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
 rename meta/recipes-core/systemd/systemd/{0016-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch => 0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch} (78%)
 rename meta/recipes-core/systemd/systemd/{0017-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch => 0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} (95%)
 rename meta/recipes-core/systemd/systemd/{0018-Define-glibc-compatible-basename-for-non-glibc-syste.patch => 0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch} (82%)
 rename meta/recipes-core/systemd/systemd/{0019-Do-not-disable-buffering-when-writing-to-oom_score_a.patch => 0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch} (82%)
 rename meta/recipes-core/systemd/systemd/{0020-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch => 0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch} (87%)
 rename meta/recipes-core/systemd/systemd/{0021-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch => 0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch} (49%)
 create mode 100644 meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0022-Use-if-instead-of-ifdef-for-ENABLE_GSHADOW.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0022-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0022-include-sys-wait.h-to-avoid-compile-failure.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0023-resolvconf-fixes-for-the-compatibility-interface.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0023-socket-util.h-include-string.h.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0024-journald-do-not-store-the-iovec-entry-for-process-co.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0025-journald-set-a-limit-on-the-number-of-fields.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0026-journal-fix-out-of-bounds-read-CVE-2018-16866.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/CVE-2019-6454.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
 rename meta/recipes-core/systemd/{systemd_239.bb => systemd_241.bb} (89%)

--
1.9.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core