Skip to contentSkip to conversation

systemd & systemd-boot: upgrade to 237

PATCH In review Chen Qi 3 participants 12 messages Mar 5, 2018 – Mar 8, 2018

Subsystems (2)
lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover systemd & systemd-boot: upgrade to 237

Changes from last patchset (236 upgrading):
1. Use more vars (AR, NM, etc.) than just CC and LD in meson.bbclass.
2. Keep the PACKAGECONFIG item's name 'manpages' for compatibility.
3. Make it check for all i*86 archs instead of just i586 for systemd-boot.
4. Fix the '==' bashism in systemd-boot.
5. Rebase patches for 237.

The following changes since commit bd5424f5b05a0a65471a77632efe7b9907370217:

maintainers.inc: add myself as maintainer for the new busybox-inittab (2018-03-04 21:23:03 +0000)

are available in the git repository at:

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

Chen Qi (4):
meson.bbclass: fix to build for more projects
systemd: upgrade to 237
systemd: fix build failure for qemux86 and qemuppc with musl
systemd-boot: upgrade to 237

 meta/classes/meson.bbclass                         |  20 +-
 .../{systemd-boot_234.bb => systemd-boot_237.bb}   |  32 ++-
 meta/recipes-core/systemd/systemd.inc              |   2 +-
 ...01-Also-check-i386-i586-and-i686-for-ia32.patch |  28 +++
 ...efi_cc-and-efi_ld-correctly-when-cross-co.patch |  62 +++++
 ...ck-protector-flags-to-workaround-musl-bui.patch |  33 +++
 ...v-when-secure-versions-are-not-available.patch} |  21 +-
 ...te-presets-after-generators-have-run-6526.patch |  69 ------
 ...any-initialization-steps-when-running-in-.patch | 163 -------------
 ...update-header-file-to-detect-memfd_create.patch |  28 ---
 ...t-install-dependency-links-at-install-tim.patch |  81 +++++++
 ...c-Check-if-memfd_create-is-already-define.patch |  27 ---
 .../systemd/0003-fileio-include-sys-mman.h.patch   |  26 --
 ...pper-instead-of-looking-for-relative-opti.patch |  64 +++++
 ...004-implment-systemd-sysv-install-for-OE.patch} |   8 +-
 ...t-install-dependency-links-at-install-tim.patch |  74 ------
 ...patch => 0005-rules-whitelist-hd-devices.patch} |   9 +-
 ...6-Make-root-s-home-directory-configurable.patch |  78 ++++++
 ...vert-rules-remove-firmware-loading-rules.patch} |   8 +-
 ...-check-for-missing-canonicalize_file_name.patch |  63 -----
 ...pper-instead-of-looking-for-relative-opti.patch |  40 ---
 .../systemd/0008-Do-not-enable-nss-tests.patch     |  35 ---
 ...remove-userspace-firmware-loading-suppor.patch} | 204 +++++++++-------
 ...=> 0009-remove-duplicate-include-uchar.h.patch} |  14 +-
 .../0010-check-for-uchar.h-in-meson.build.patch    |  45 ++++
 ...nes-Build-conditionally-when-HAVE_MYHOSTN.patch |  38 ---
 ...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} |  26 +-
 ...es-watch-metadata-changes-in-ide-devices.patch} |   8 +-
 ...3-Make-root-s-home-directory-configurable.patch | 155 ------------
 ...lback-parse_printf_format-implementation.patch} |  86 ++++---
 ...sic-missing.h-check-for-missing-strndupa.patch} |  96 ++++----
 ...f-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} |  30 +--
 ...ssing.h-check-for-missing-__compar_fn_t-.patch} |  18 +-
 ...patch => 0017-Include-netinet-if_ether.h.patch} |  55 +++--
 ...-check-for-missing-canonicalize_file_name.patch |  47 ++++
 .../0018-check-for-uchar.h-in-configure.patch      |  44 ----
 ...le-nss-tests-if-nss-systemd-is-not-enable.patch |  29 +++
 ...xdecoct.c-Include-missing.h-for-strndupa.patch} |  15 +-
 ...c-Disable-tests-for-missing-typedefs-in-.patch} |  39 ++-
 ...=> 0022-don-t-use-glibc-specific-qsort_r.patch} |  26 +-
 ...ss-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} |  22 +-
 ...n_t-is-glibc-specific-use-raw-signature-.patch} |  14 +-
 ...ATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} |  16 +-
 ...> 0026-Use-uintmax_t-for-handling-rlim_t.patch} |  22 +-
 .../0027-remove-nobody-user-group-checking.patch   |  63 +++++
 .../0028-add-missing-FTW_-macros-for-musl.patch    |  50 ++++
 ...nes-Build-conditionally-when-ENABLE_MYHOS.patch |  43 ++++
 ...-of-__register_atfork-for-non-glibc-build.patch |  45 ++++
 ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch |  30 +++
 meta/recipes-core/systemd/systemd/run-ptest        |   6 -
 .../systemd/{systemd_234.bb => systemd_237.bb}     | 270 +++++++++------------
 51 files changed, 1220 insertions(+), 1307 deletions(-)
 rename meta/recipes-core/systemd/{systemd-boot_234.bb => systemd-boot_237.bb} (41%)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
 rename meta/recipes-core/systemd/systemd/{0004-Use-getenv-when-secure-versions-are-not-available.patch => 0001-Use-getenv-when-secure-versions-are-not-available.patch} (53%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-main-skip-many-initialization-steps-when-running-in-.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
 rename meta/recipes-core/systemd/systemd/{0010-implment-systemd-sysv-install-for-OE.patch => 0004-implment-systemd-sysv-install-for-OE.patch} (89%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
 rename meta/recipes-core/systemd/systemd/{0012-rules-whitelist-hd-devices.patch => 0005-rules-whitelist-hd-devices.patch} (89%)
 create mode 100644 meta/recipes-core/systemd/systemd/0006-Make-root-s-home-directory-configurable.patch
 rename meta/recipes-core/systemd/systemd/{0014-Revert-rules-remove-firmware-loading-rules.patch => 0007-Revert-rules-remove-firmware-loading-rules.patch} (81%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0007-check-for-missing-canonicalize_file_name.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0008-Do-not-enable-nss-tests.patch
 rename meta/recipes-core/systemd/systemd/{0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch => 0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch} (63%)
 rename meta/recipes-core/systemd/systemd/{0017-remove-duplicate-include-uchar.h.patch => 0009-remove-duplicate-include-uchar.h.patch} (78%)
 create mode 100644 meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
 rename meta/recipes-core/systemd/systemd/{0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch => 0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch} (58%)
 rename meta/recipes-core/systemd/systemd/{0020-rules-watch-metadata-changes-in-ide-devices.patch => 0012-rules-watch-metadata-changes-in-ide-devices.patch} (90%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
 rename meta/recipes-core/systemd/systemd/{0001-add-fallback-parse_printf_format-implementation.patch => 0013-add-fallback-parse_printf_format-implementation.patch} (88%)
 rename meta/recipes-core/systemd/systemd/{0002-src-basic-missing.h-check-for-missing-strndupa.patch => 0014-src-basic-missing.h-check-for-missing-strndupa.patch} (47%)
 rename meta/recipes-core/systemd/systemd/{0003-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} (88%)
 rename meta/recipes-core/systemd/systemd/{0004-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch => 0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch} (77%)
 rename meta/recipes-core/systemd/systemd/{0006-Include-netinet-if_ether.h.patch => 0017-Include-netinet-if_ether.h.patch} (67%)
 create mode 100644 meta/recipes-core/systemd/systemd/0018-check-for-missing-canonicalize_file_name.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0018-check-for-uchar.h-in-configure.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
 rename meta/recipes-core/systemd/systemd/{0009-test-hexdecoct.c-Include-missing.h-form-strndupa.patch => 0020-test-hexdecoct.c-Include-missing.h-for-strndupa.patch} (68%)
 rename meta/recipes-core/systemd/systemd/{0010-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch => 0021-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch} (49%)
 rename meta/recipes-core/systemd/systemd/{0011-don-t-use-glibc-specific-qsort_r.patch => 0022-don-t-use-glibc-specific-qsort_r.patch} (88%)
 rename meta/recipes-core/systemd/systemd/{0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch => 0023-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} (90%)
 rename meta/recipes-core/systemd/systemd/{0013-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch => 0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch} (77%)
 rename meta/recipes-core/systemd/systemd/{0001-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch => 0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} (80%)
 rename meta/recipes-core/systemd/systemd/{0001-Use-uintmax_t-for-handling-rlim_t.patch => 0026-Use-uintmax_t-for-handling-rlim_t.patch} (89%)
 create mode 100644 meta/recipes-core/systemd/systemd/0027-remove-nobody-user-group-checking.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0029-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/run-ptest
 rename meta/recipes-core/systemd/{systemd_234.bb => systemd_237.bb} (71%)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/4 meson.bbclass: fix to build for more projects

We should use the value of CC for the c compiler setting in cross compilation configuration file for meson. For example, if we only use ${HOST_PREFIX}gcc instead of ${CC}, we would meet the following do_compile failure for systemd.

cc1: fatal error: linux/capability.h: No such file or directory

Do the same change for LD, AR, NM, STRIP and READELF.

---
 meta/classes/meson.bbclass | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)
meta/classes/meson.bbclass +8 -12
index 31d32a5..2d7ee4f 100644
@@ -41,26 +41,22 @@ MESON_CROSS_FILE = ""
 MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross"
 MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross"
 
-CCOMPILER ?= "gcc"
-CXXCOMPILER ?= "g++"
-CCOMPILER_toolchain-clang = "clang"
-CXXCOMPILER_toolchain-clang = "clang++"
-
 def meson_array(var, d):
     return "', '".join(d.getVar(var).split()).join(("'", "'"))
 
 addtask write_config before do_configure
-do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS MESON_LINK_ARGS"
+do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS MESON_LINK_ARGS CC CXX LD AR NM STRIP READELF"
 do_write_config() {
     # This needs to be Py to split the args into single-element lists
     cat >${WORKDIR}/meson.cross <<EOF
 [binaries]
-c = '${HOST_PREFIX}${CCOMPILER}'
-cpp = '${HOST_PREFIX}${CXXCOMPILER}'
-ar = '${HOST_PREFIX}ar'
-ld = '${HOST_PREFIX}ld'
-strip = '${HOST_PREFIX}strip'
-readelf = '${HOST_PREFIX}readelf'
+c = [${@meson_array('CC', d)}]
+cpp = [${@meson_array('CXX', d)}]
+ar = [${@meson_array('AR', d)}]
+nm = [${@meson_array('NM', d)}]
+ld = [${@meson_array('LD', d)}]
+strip = [${@meson_array('STRIP', d)}]
+readelf = [${@meson_array('READELF', d)}]
 pkgconfig = 'pkg-config'
 
 [properties]
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 2/4 systemd: upgrade to 237

In reply to Chen Qi

Upgrade systemd to 237.

Note that this version has dropped autotools support.

The following patches are rebased:
0004-Use-getenv-when-secure-versions-are-not-available.patch 0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch 0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch 0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch 0018-check-for-uchar.h-in-configure.patch 0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch 0001-add-fallback-parse_printf_format-implementation.patch 0002-src-basic-missing.h-check-for-missing-strndupa.patch 0007-check-for-missing-canonicalize_file_name.patch 0008-Do-not-enable-nss-tests.patch 0010-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch 0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch

The following backported patches are dropped:
0001-core-evaluate-presets-after-generators-have-run-6526.patch 0001-main-skip-many-initialization-steps-when-running-in-.patch 0001-meson-update-header-file-to-detect-memfd_create.patch 0003-fileio-include-sys-mman.h.patch

The following patch is dropped as autotools support is dropped:
0002-configure.ac-Check-if-memfd_create-is-already-define.patch

The following patches are newly added to fix problems:
0027-remove-nobody-user-group-checking.patch 0028-add-missing-FTW_-macros-for-musl.patch 0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch 0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch

Other changes are mostly autotools/meson related.

This new version has dropped ptest support, as there's no easy way to do this in the framework of meson.

---
 meta/recipes-core/systemd/systemd.inc              |   2 +-
 ...v-when-secure-versions-are-not-available.patch} |  21 +-
 ...te-presets-after-generators-have-run-6526.patch |  69 ------
 ...any-initialization-steps-when-running-in-.patch | 163 -------------
 ...update-header-file-to-detect-memfd_create.patch |  28 ---
 ...t-install-dependency-links-at-install-tim.patch |  81 +++++++
 ...c-Check-if-memfd_create-is-already-define.patch |  27 ---
 .../systemd/0003-fileio-include-sys-mman.h.patch   |  26 --
 ...pper-instead-of-looking-for-relative-opti.patch |  64 +++++
 ...004-implment-systemd-sysv-install-for-OE.patch} |   8 +-
 ...t-install-dependency-links-at-install-tim.patch |  74 ------
 ...patch => 0005-rules-whitelist-hd-devices.patch} |   9 +-
 ...6-Make-root-s-home-directory-configurable.patch |  78 ++++++
 ...vert-rules-remove-firmware-loading-rules.patch} |   8 +-
 ...-check-for-missing-canonicalize_file_name.patch |  63 -----
 ...pper-instead-of-looking-for-relative-opti.patch |  40 ----
 .../systemd/0008-Do-not-enable-nss-tests.patch     |  35 ---
 ...remove-userspace-firmware-loading-suppor.patch} | 204 +++++++++-------
 ...=> 0009-remove-duplicate-include-uchar.h.patch} |  14 +-
 .../0010-check-for-uchar.h-in-meson.build.patch    |  45 ++++
 ...nes-Build-conditionally-when-HAVE_MYHOSTN.patch |  38 ---
 ...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} |  26 +-
 ...es-watch-metadata-changes-in-ide-devices.patch} |   8 +-
 ...3-Make-root-s-home-directory-configurable.patch | 155 ------------
 ...lback-parse_printf_format-implementation.patch} |  86 ++++---
 ...sic-missing.h-check-for-missing-strndupa.patch} |  96 ++++----
 ...f-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} |  30 +--
 ...ssing.h-check-for-missing-__compar_fn_t-.patch} |  18 +-
 ...patch => 0017-Include-netinet-if_ether.h.patch} |  55 +++--
 ...-check-for-missing-canonicalize_file_name.patch |  47 ++++
 .../0018-check-for-uchar.h-in-configure.patch      |  44 ----
 ...le-nss-tests-if-nss-systemd-is-not-enable.patch |  29 +++
 ...xdecoct.c-Include-missing.h-for-strndupa.patch} |  15 +-
 ...c-Disable-tests-for-missing-typedefs-in-.patch} |  39 ++-
 ...=> 0022-don-t-use-glibc-specific-qsort_r.patch} |  26 +-
 ...ss-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} |  22 +-
 ...n_t-is-glibc-specific-use-raw-signature-.patch} |  14 +-
 ...ATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} |  16 +-
 ...> 0026-Use-uintmax_t-for-handling-rlim_t.patch} |  22 +-
 .../0027-remove-nobody-user-group-checking.patch   |  63 +++++
 .../0028-add-missing-FTW_-macros-for-musl.patch    |  50 ++++
 ...nes-Build-conditionally-when-ENABLE_MYHOS.patch |  43 ++++
 ...-of-__register_atfork-for-non-glibc-build.patch |  45 ++++
 ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch |  30 +++
 meta/recipes-core/systemd/systemd/run-ptest        |   6 -
 .../systemd/{systemd_234.bb => systemd_237.bb}     | 266 ++++++++-------------
 46 files changed, 1066 insertions(+), 1282 deletions(-)
 rename meta/recipes-core/systemd/systemd/{0004-Use-getenv-when-secure-versions-are-not-available.patch => 0001-Use-getenv-when-secure-versions-are-not-available.patch} (53%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-main-skip-many-initialization-steps-when-running-in-.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
 rename meta/recipes-core/systemd/systemd/{0010-implment-systemd-sysv-install-for-OE.patch => 0004-implment-systemd-sysv-install-for-OE.patch} (89%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
 rename meta/recipes-core/systemd/systemd/{0012-rules-whitelist-hd-devices.patch => 0005-rules-whitelist-hd-devices.patch} (89%)
 create mode 100644 meta/recipes-core/systemd/systemd/0006-Make-root-s-home-directory-configurable.patch
 rename meta/recipes-core/systemd/systemd/{0014-Revert-rules-remove-firmware-loading-rules.patch => 0007-Revert-rules-remove-firmware-loading-rules.patch} (81%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0007-check-for-missing-canonicalize_file_name.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0008-Do-not-enable-nss-tests.patch
 rename meta/recipes-core/systemd/systemd/{0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch => 0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch} (63%)
 rename meta/recipes-core/systemd/systemd/{0017-remove-duplicate-include-uchar.h.patch => 0009-remove-duplicate-include-uchar.h.patch} (78%)
 create mode 100644 meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
 rename meta/recipes-core/systemd/systemd/{0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch => 0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch} (58%)
 rename meta/recipes-core/systemd/systemd/{0020-rules-watch-metadata-changes-in-ide-devices.patch => 0012-rules-watch-metadata-changes-in-ide-devices.patch} (90%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
 rename meta/recipes-core/systemd/systemd/{0001-add-fallback-parse_printf_format-implementation.patch => 0013-add-fallback-parse_printf_format-implementation.patch} (88%)
 rename meta/recipes-core/systemd/systemd/{0002-src-basic-missing.h-check-for-missing-strndupa.patch => 0014-src-basic-missing.h-check-for-missing-strndupa.patch} (47%)
 rename meta/recipes-core/systemd/systemd/{0003-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} (88%)
 rename meta/recipes-core/systemd/systemd/{0004-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch => 0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch} (77%)
 rename meta/recipes-core/systemd/systemd/{0006-Include-netinet-if_ether.h.patch => 0017-Include-netinet-if_ether.h.patch} (67%)
 create mode 100644 meta/recipes-core/systemd/systemd/0018-check-for-missing-canonicalize_file_name.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0018-check-for-uchar.h-in-configure.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
 rename meta/recipes-core/systemd/systemd/{0009-test-hexdecoct.c-Include-missing.h-form-strndupa.patch => 0020-test-hexdecoct.c-Include-missing.h-for-strndupa.patch} (68%)
 rename meta/recipes-core/systemd/systemd/{0010-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch => 0021-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch} (49%)
 rename meta/recipes-core/systemd/systemd/{0011-don-t-use-glibc-specific-qsort_r.patch => 0022-don-t-use-glibc-specific-qsort_r.patch} (88%)
 rename meta/recipes-core/systemd/systemd/{0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch => 0023-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} (90%)
 rename meta/recipes-core/systemd/systemd/{0013-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch => 0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch} (77%)
 rename meta/recipes-core/systemd/systemd/{0001-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch => 0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} (80%)
 rename meta/recipes-core/systemd/systemd/{0001-Use-uintmax_t-for-handling-rlim_t.patch => 0026-Use-uintmax_t-for-handling-rlim_t.patch} (89%)
 create mode 100644 meta/recipes-core/systemd/systemd/0027-remove-nobody-user-group-checking.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0029-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/run-ptest
 rename meta/recipes-core/systemd/{systemd_234.bb => systemd_237.bb} (71%)
meta/recipes-core/systemd/systemd.inc +1 -1
index d99d150..5fa48e7a 100644
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "c1edab7ad1e7ccc9be693bedfd464cd1cbffb395"
+SRCREV = "46659f7deb962f55c728e70597e37c2a3ab6326d"
 
 SRC_URI = "git://github.com/systemd/systemd.git;protocol=git"
 
meta/recipes-core/systemd/systemd/0001-Use-getenv-when-secure-versions-are-not-available.patch renamed from meta/recipes-core/systemd/systemd/0004-Use-getenv-when-secure-versions-are-not-available.patch +12 -9
similarity index 53%
rename from meta/recipes-core/systemd/systemd/0004-Use-getenv-when-secure-versions-are-not-available.patch
rename to meta/recipes-core/systemd/systemd/0001-Use-getenv-when-secure-versions-are-not-available.patch
index ab2cbe0..f4c15e1 100644
@@ -1,23 +1,26 @@
-From 5765cda4f7243e240b1e8723dc536fb20503d544 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 9 Nov 2016 19:28:32 -0800
-Subject: [PATCH 04/19] Use getenv when secure versions are not available
+From b1192a6e171413291d9d64fafc04773c6bbc9cab Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Fri, 23 Feb 2018 10:04:48 +0800
+Subject: [PATCH 01/31] 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 imeplementation
+to it if configure does not detect a secure implementation
 
 Signed-off-by: Khem Raj <[email protected]>
+
 Upstream-Status: Denied
+
+Signed-off-by: Chen Qi <[email protected]>
 ---
  src/basic/missing.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 4a3fd9c..4936873 100644
+index 1280e6c41..39c1fb700 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -529,7 +529,7 @@ struct btrfs_ioctl_quota_ctl_args {
- #  ifdef HAVE___SECURE_GETENV
+@@ -605,7 +605,7 @@ struct btrfs_ioctl_quota_ctl_args {
+ #  if HAVE___SECURE_GETENV
  #    define secure_getenv __secure_getenv
  #  else
 -#    error "neither secure_getenv nor __secure_getenv are available"
@@ -26,5 +29,5 @@ index 4a3fd9c..4936873 100644
  #endif
  
 -- 
-2.10.2
+2.13.0
 
meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch deleted +0 -69

69 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-main-skip-many-initialization-steps-when-running-in-.patch deleted +0 -163

163 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch deleted +0 -28
deleted file mode 100644
index c643120..0000000
@@ -1,28 +0,0 @@
-From 2207e1ffe4f7e2dcc5e745dadb48738aa1048d63 Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <[email protected]>
-Date: Sun, 26 Nov 2017 02:17:06 +0900
-Subject: [PATCH 1/3] meson: update header file to detect memfd_create()
-
----
-Upstream-Status: Backport
-
- meson.build | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 20b27c860..550dd4ad8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -414,7 +414,8 @@ foreach ident : ['secure_getenv', '__secure_getenv']
- endforeach
- 
- foreach ident : [
--        ['memfd_create',      '''#include <sys/memfd.h>'''],
-+        ['memfd_create',      '''#define _GNU_SOURCE
-+                                 #include <sys/mman.h>'''],
-         ['gettid',            '''#include <sys/types.h>'''],
-         ['pivot_root',        '''#include <stdlib.h>'''],     # no known header declares pivot_root
-         ['name_to_handle_at', '''#define _GNU_SOURCE
--- 
-2.16.1
-
meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch new file +81 -0

81 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch deleted +0 -27
deleted file mode 100644
index da798a7..0000000
@@ -1,27 +0,0 @@
-From 025408c87869962f511de044dd41a1f4b1d80165 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 27 Jan 2018 11:53:38 -0800
-Subject: [PATCH 2/3] configure.ac: Check if memfd_create is already defined
-
-Upstream-Status: Inappropriate [upstream systemd uses meson]
-
-Signed-off-by: Khem Raj <[email protected]>
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 3674190fb..c7a184d72 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -340,6 +340,7 @@ AC_CHECK_DECLS([
-         [], [], [[
- #include <sys/types.h>
- #include <unistd.h>
-+#include <sys/mman.h>
- #include <sys/mount.h>
- #include <fcntl.h>
- #include <sched.h>
--- 
-2.16.1
-
meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch deleted +0 -26
deleted file mode 100644
index c466d0d..0000000
@@ -1,26 +0,0 @@
-From 52e922343faaa87b9efb8aa9ea578399ccc9bec9 Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <[email protected]>
-Date: Sun, 26 Nov 2017 02:40:23 +0900
-Subject: [PATCH 3/3] fileio: include sys/mman.h
-
----
-Upstream-Status: Backport
-
- src/basic/fileio.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/basic/fileio.c b/src/basic/fileio.c
-index 9a185e3e6..1015afd29 100644
---- a/src/basic/fileio.c
-+++ b/src/basic/fileio.c
-@@ -24,6 +24,7 @@
- #include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/mman.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
--- 
-2.16.1
-
meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch new file +64 -0

64 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0004-implment-systemd-sysv-install-for-OE.patch renamed from meta/recipes-core/systemd/systemd/0010-implment-systemd-sysv-install-for-OE.patch +4 -4
similarity index 89%
rename from meta/recipes-core/systemd/systemd/0010-implment-systemd-sysv-install-for-OE.patch
rename to meta/recipes-core/systemd/systemd/0004-implment-systemd-sysv-install-for-OE.patch
index 8828d6e..83fdb53 100644
@@ -1,7 +1,7 @@
-From 52726be92e2b841f744a96c378cc872ae0033a2b Mon Sep 17 00:00:00 2001
+From 70d456fb21de2a80697fa364f08475339d6396c1 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Sat, 5 Sep 2015 06:31:47 +0000
-Subject: [PATCH 10/19] implment systemd-sysv-install for OE
+Subject: [PATCH 04/31] 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 a53a3e6..5d877b0 100755
+index a53a3e622..5d877b06e 100755
 --- a/src/systemctl/systemd-sysv-install.SKELETON
 +++ b/src/systemctl/systemd-sysv-install.SKELETON
 @@ -30,17 +30,17 @@ case "$1" in
@@ -39,5 +39,5 @@ index a53a3e6..5d877b0 100755
      *)
          usage ;;
 -- 
-2.10.2
+2.13.0
 
meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch deleted +0 -74

74 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0005-rules-whitelist-hd-devices.patch renamed from meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch +4 -5
similarity index 89%
rename from meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch
rename to meta/recipes-core/systemd/systemd/0005-rules-whitelist-hd-devices.patch
index eb380ce..e4421c8 100644
@@ -1,7 +1,7 @@
-From ab5a27040133f7cdf062ac8cfeb94e081d3567b3 Mon Sep 17 00:00:00 2001
+From 7b5b34993002b4418ba8a3c2ae661a7337fd8ed0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 9 Nov 2016 19:41:13 -0800
-Subject: [PATCH 07/14] rules: whitelist hd* devices
+Subject: [PATCH 05/31] 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,13 +11,12 @@ Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276]
 
 Signed-off-by: Patrick Ohly <[email protected]>
 Signed-off-by: Khem Raj <[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 d2745f65f..63f472be8 100644
+index 0de8cf3a1..d3f58f153 100644
 --- a/rules/60-persistent-storage.rules
 +++ b/rules/60-persistent-storage.rules
 @@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end"
@@ -30,5 +29,5 @@ index d2745f65f..63f472be8 100644
  # ignore partitions that span the entire disk
  TEST=="whole_disk", GOTO="persistent_storage_end"
 -- 
-2.13.2
+2.13.0
 
meta/recipes-core/systemd/systemd/0006-Make-root-s-home-directory-configurable.patch new file +78 -0

78 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0007-Revert-rules-remove-firmware-loading-rules.patch renamed from meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch +4 -4
similarity index 81%
rename from meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
rename to meta/recipes-core/systemd/systemd/0007-Revert-rules-remove-firmware-loading-rules.patch
index ed7c68f..bb12d30 100644
@@ -1,7 +1,7 @@
-From 0f47cfcb16e8e40a90a9221f9995f8cd8a915c22 Mon Sep 17 00:00:00 2001
+From 35d6d384e83ac38077603611bb791969ef95fe68 Mon Sep 17 00:00:00 2001
 From: Jonathan Liu <[email protected]>
 Date: Thu, 19 Mar 2015 15:01:29 +1100
-Subject: [PATCH 14/19] Revert "rules: remove firmware loading rules"
+Subject: [PATCH 07/31] Revert "rules: remove firmware loading rules"
 
 This reverts commit 70e7d754ddb356fb1a2942b262f8cee9650e2a19.
 Userspace firmware loading support is needed for Linux < 3.7.
@@ -16,7 +16,7 @@ Signed-off-by: Jonathan Liu <[email protected]>
 
 diff --git a/rules/50-firmware.rules b/rules/50-firmware.rules
 new file mode 100644
-index 0000000..f0ae684
+index 000000000..f0ae68451
 --- /dev/null
 +++ b/rules/50-firmware.rules
 @@ -0,0 +1,3 @@
@@ -24,5 +24,5 @@ index 0000000..f0ae684
 +
 +SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware"
 -- 
-2.10.2
+2.13.0
 
meta/recipes-core/systemd/systemd/0007-check-for-missing-canonicalize_file_name.patch deleted +0 -63

63 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch deleted +0 -40
deleted file mode 100644
index bc92db7..0000000
@@ -1,40 +0,0 @@
-From a3482c91642cf568b3ac27fa6c0cb3c6b30669b7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 9 Nov 2016 19:32:14 -0800
-Subject: [PATCH 07/19] use lnr wrapper instead of looking for --relative
- option for ln
-
-Upstream-Status: Inappropriate [OE-Specific]
-
-Signed-off-by: Khem Raj <[email protected]>
----
- Makefile.am  | 2 +-
- configure.ac | 2 --
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-Index: git/Makefile.am
-===================================================================
---- git.orig/Makefile.am
-+++ git/Makefile.am
-@@ -320,7 +320,7 @@ define install-relative-aliases
- 	while [ -n "$$1" ]; do \
- 		$(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
- 		rm -f $(DESTDIR)$$dir/$$2 && \
--		$(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
-+		lnr $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
- 		shift 2 || exit $$?; \
- 	done
- endef
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac
-+++ git/configure.ac
-@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr
- AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin])
- AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
- 
--AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
--
- M4_DEFINES=
- 
- AC_CHECK_TOOL(OBJCOPY, objcopy)
meta/recipes-core/systemd/systemd/0008-Do-not-enable-nss-tests.patch deleted +0 -35
deleted file mode 100644
index 67a4f8e..0000000
@@ -1,35 +0,0 @@
-From 48e7c0f5b2f5d777a16ac5584dc4f50f1dfa832c Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 23 Oct 2017 12:27:53 -0700
-Subject: [PATCH 08/12] Do not enable nss tests
-
-Signed-off-by: Khem Raj <[email protected]>
----
-Upstream-Status: Pending
-
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 3cc8f3451..df20a9a11 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -5290,6 +5290,7 @@ EXTRA_DIST += \
- 	src/timesync/timesyncd.conf.in
- 
- # ------------------------------------------------------------------------------
-+if ENABLE_NSS_SYSTEMD
- test_nss_SOURCES = \
- 	src/test/test-nss.c
- 
-@@ -5302,7 +5303,6 @@ manual_tests += \
- 	test-nss
- 
- # ------------------------------------------------------------------------------
--if ENABLE_NSS_SYSTEMD
- libnss_systemd_la_SOURCES = \
- 	src/nss-systemd/nss-systemd.sym \
- 	src/nss-systemd/nss-systemd.c
--- 
-2.14.2
-
meta/recipes-core/systemd/systemd/0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch renamed from meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch +115 -89

302 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0009-remove-duplicate-include-uchar.h.patch renamed from meta/recipes-core/systemd/systemd/0017-remove-duplicate-include-uchar.h.patch +7 -7
similarity index 78%
rename from meta/recipes-core/systemd/systemd/0017-remove-duplicate-include-uchar.h.patch
rename to meta/recipes-core/systemd/systemd/0009-remove-duplicate-include-uchar.h.patch
index d200635..1b14369 100644
@@ -1,7 +1,7 @@
-From e78af874fc9f3d3af49498b8207109993d93a596 Mon Sep 17 00:00:00 2001
+From ffdf9cb6ba0d932b81933d824f23a878c313a8d4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Mon, 22 Feb 2016 05:59:01 +0000
-Subject: [PATCH 17/19] remove duplicate include uchar.h
+Subject: [PATCH 09/31] remove duplicate include uchar.h
 
 missing.h already includes it
 
@@ -13,10 +13,10 @@ Upstream-Status: Pending
  2 files changed, 2 deletions(-)
 
 diff --git a/src/basic/escape.h b/src/basic/escape.h
-index deaa4de..36d437c 100644
+index de89f43a8..9921ccbbd 100644
 --- a/src/basic/escape.h
 +++ b/src/basic/escape.h
-@@ -23,7 +23,6 @@
+@@ -24,7 +24,6 @@
  #include <stddef.h>
  #include <stdint.h>
  #include <sys/types.h>
@@ -25,10 +25,10 @@ index deaa4de..36d437c 100644
  #include "string-util.h"
  #include "missing.h"
 diff --git a/src/basic/utf8.h b/src/basic/utf8.h
-index f9b9c94..6ac9a3c 100644
+index b0a7485ae..fa06d2906 100644
 --- a/src/basic/utf8.h
 +++ b/src/basic/utf8.h
-@@ -22,7 +22,6 @@
+@@ -23,7 +23,6 @@
  #include <stdbool.h>
  #include <stddef.h>
  #include <stdint.h>
@@ -37,5 +37,5 @@ index f9b9c94..6ac9a3c 100644
  #include "macro.h"
  #include "missing.h"
 -- 
-2.10.2
+2.13.0
 
meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch new file +45 -0

45 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch deleted +0 -38
deleted file mode 100644
index b01ae97..0000000
@@ -1,38 +0,0 @@
-From 3f6f45578b828e414f50c6822375073e7174236a Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 14 Dec 2015 00:50:01 +0000
-Subject: [PATCH 11/19] nss-mymachines: Build conditionally when
- HAVE_MYHOSTNAME is set
-
-Fixes build failures when building with --disable-myhostname
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 02f4017..420e0e0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -5146,6 +5146,7 @@ SYSTEM_UNIT_ALIASES += \
- BUSNAMES_TARGET_WANTS += \
- 	org.freedesktop.machine1.busname
- 
-+if HAVE_MYHOSTNAME
- libnss_mymachines_la_SOURCES = \
- 	src/nss-mymachines/nss-mymachines.sym \
- 	src/nss-mymachines/nss-mymachines.c
-@@ -5167,6 +5168,7 @@ rootlib_LTLIBRARIES += \
- 	libnss_mymachines.la
- 
- endif
-+endif
- 
- polkitpolicy_in_files += \
- 	src/machine/org.freedesktop.machine1.policy.in
--- 
-2.10.2
-
meta/recipes-core/systemd/systemd/0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch renamed from meta/recipes-core/systemd/systemd/0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch +14 -12
similarity index 58%
rename from meta/recipes-core/systemd/systemd/0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
rename to meta/recipes-core/systemd/systemd/0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
index b609276..b0923d1 100644
@@ -1,25 +1,26 @@
-From b7c6bfe2ec5ae426e586e1d6ecadb52a97128a3f Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 9 Nov 2016 20:49:53 -0800
-Subject: [PATCH 13/14] socket-util: don't fail if libc doesn't support IDN
+From 60dd411e9756fc2b14c0e061ad803782b4aee874 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Mon, 26 Feb 2018 15:46:05 +0800
+Subject: [PATCH 11/31] socket-util: don't fail if libc doesn't support IDN
 
 Upstream-Status: Pending
 
 Signed-off-by: Emil Renner Berthing <[email protected]>
 Signed-off-by: Khem Raj <[email protected]>
 
+Signed-off-by: Chen Qi <[email protected]>
 ---
- src/basic/socket-util.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
+ src/basic/socket-util.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
 
 diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
-index 016e64aa0..d4658826e 100644
+index 2c70cade1..67aedadd4 100644
 --- a/src/basic/socket-util.c
 +++ b/src/basic/socket-util.c
-@@ -47,6 +47,15 @@
- #include "user-util.h"
+@@ -50,6 +50,16 @@
  #include "utf8.h"
  #include "util.h"
+ 
 +/* Don't fail if the standard library
 + * doesn't support IDN */
 +#ifndef NI_IDN
@@ -29,9 +30,10 @@ index 016e64aa0..d4658826e 100644
 +#ifndef NI_IDN_USE_STD3_ASCII_RULES
 +#define NI_IDN_USE_STD3_ASCII_RULES 0
 +#endif
- 
- #ifdef ENABLE_IDN
++
+ #if ENABLE_IDN
  #  define IDN_FLAGS (NI_IDN|NI_IDN_USE_STD3_ASCII_RULES)
+ #else
 -- 
-2.13.2
+2.13.0
 
meta/recipes-core/systemd/systemd/0012-rules-watch-metadata-changes-in-ide-devices.patch renamed from meta/recipes-core/systemd/systemd/0020-rules-watch-metadata-changes-in-ide-devices.patch +4 -4
similarity index 90%
rename from meta/recipes-core/systemd/systemd/0020-rules-watch-metadata-changes-in-ide-devices.patch
rename to meta/recipes-core/systemd/systemd/0012-rules-watch-metadata-changes-in-ide-devices.patch
index 17d698a..7207863 100644
@@ -1,7 +1,7 @@
-From 8207d645582e96c56950674e104653d0cd552d60 Mon Sep 17 00:00:00 2001
+From 406a4c8692316e8c7e14c78f9a802689be304a95 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Fri, 17 Nov 2017 09:46:00 +0800
-Subject: [PATCH] rules: watch metadata changes in ide devices
+Subject: [PATCH 12/31] 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
@@ -29,7 +29,7 @@ Signed-off-by: Hongxu Jia <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/rules/60-block.rules b/rules/60-block.rules
-index 343fc06..b5237da 100644
+index 343fc06f8..b5237dac4 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_
@@ -39,5 +39,5 @@ index 343fc06..b5237da 100644
 -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"
 -- 
-1.8.3.1
+2.13.0
 
meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch deleted +0 -155

155 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0013-add-fallback-parse_printf_format-implementation.patch renamed from meta/recipes-core/systemd/systemd/0001-add-fallback-parse_printf_format-implementation.patch +42 -44

141 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0014-src-basic-missing.h-check-for-missing-strndupa.patch renamed from meta/recipes-core/systemd/systemd/0002-src-basic-missing.h-check-for-missing-strndupa.patch +55 -41

150 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch renamed from meta/recipes-core/systemd/systemd/0003-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch +15 -15
similarity index 88%
rename from meta/recipes-core/systemd/systemd/0003-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
rename to meta/recipes-core/systemd/systemd/0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
index 9a2d2c8..4509476 100644
@@ -1,7 +1,7 @@
-From 5bbbc2a08a3b4283ec04af0e77e25fb205aa8b82 Mon Sep 17 00:00:00 2001
+From b45cf4923c7e1f1165925e9b4d7db2108faf2eae Mon Sep 17 00:00:00 2001
 From: Emil Renner Berthing <[email protected]>
 Date: Mon, 23 Oct 2017 10:50:14 -0700
-Subject: [PATCH 03/12] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not
+Subject: [PATCH 15/31] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not
  defined
 
 If the standard library doesn't provide brace
@@ -11,20 +11,20 @@ Dont use GNU GLOB extentions on non-glibc systems
 
 Conditionalize use of GLOB_ALTDIRFUNC
 
-Signed-off-by: Khem Raj <[email protected]>
----
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <[email protected]>
+---
  src/basic/glob-util.c     | 20 +++++++++++++++++---
  src/test/test-glob-util.c | 17 +++++++++++++++--
  src/tmpfiles/tmpfiles.c   |  8 ++++++++
  3 files changed, 40 insertions(+), 5 deletions(-)
 
 diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
-index f611c42e4..ad6e2be8d 100644
+index 6e80a1e23..312bb3fd1 100644
 --- a/src/basic/glob-util.c
 +++ b/src/basic/glob-util.c
-@@ -27,13 +27,18 @@
+@@ -28,13 +28,18 @@
  #include "macro.h"
  #include "path-util.h"
  #include "strv.h"
@@ -44,7 +44,7 @@ index f611c42e4..ad6e2be8d 100644
          if (!pglob->gl_closedir)
                  pglob->gl_closedir = (void (*)(void *)) closedir;
          if (!pglob->gl_readdir)
-@@ -44,10 +49,13 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
+@@ -45,10 +50,13 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
                  pglob->gl_lstat = lstat;
          if (!pglob->gl_stat)
                  pglob->gl_stat = stat;
@@ -60,7 +60,7 @@ index f611c42e4..ad6e2be8d 100644
          if (k == GLOB_NOMATCH)
                  return -ENOENT;
          if (k == GLOB_NOSPACE)
-@@ -60,6 +68,12 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
+@@ -61,6 +69,12 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
          return 0;
  }
  
@@ -74,10 +74,10 @@ index f611c42e4..ad6e2be8d 100644
          _cleanup_globfree_ glob_t g = {};
          int k;
 diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
-index af866e004..3afa09ada 100644
+index bd2f8fcfd..a10c77427 100644
 --- a/src/test/test-glob-util.c
 +++ b/src/test/test-glob-util.c
-@@ -29,6 +29,11 @@
+@@ -30,6 +30,11 @@
  #include "glob-util.h"
  #include "macro.h"
  #include "rm-rf.h"
@@ -89,7 +89,7 @@ index af866e004..3afa09ada 100644
  
  static void test_glob_exists(void) {
          char name[] = "/tmp/test-glob_exists.XXXXXX";
-@@ -51,25 +56,33 @@ static void test_glob_exists(void) {
+@@ -52,25 +57,33 @@ static void test_glob_exists(void) {
  static void test_glob_no_dot(void) {
          char template[] = "/tmp/test-glob-util.XXXXXXX";
          const char *fn;
@@ -126,10 +126,10 @@ index af866e004..3afa09ada 100644
  
          (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL);
 diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 9419c99e2..07027a765 100644
+index 38cbb739c..88cc543f0 100644
 --- a/src/tmpfiles/tmpfiles.c
 +++ b/src/tmpfiles/tmpfiles.c
-@@ -71,6 +71,12 @@
+@@ -76,6 +76,12 @@
  #include "umask-util.h"
  #include "user-util.h"
  #include "util.h"
@@ -142,7 +142,7 @@ index 9419c99e2..07027a765 100644
  
  /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates
   * them in the file system. This is intended to be used to create
-@@ -1092,7 +1098,9 @@ static int item_do_children(Item *i, const char *path, action_t action) {
+@@ -1288,7 +1294,9 @@ static int item_do_children(Item *i, const char *path, action_t action) {
  
  static int glob_item(Item *i, action_t action, bool recursive) {
          _cleanup_globfree_ glob_t g = {
@@ -153,5 +153,5 @@ index 9419c99e2..07027a765 100644
          int r = 0, k;
          char **fn;
 -- 
-2.14.2
+2.13.0
 
meta/recipes-core/systemd/systemd/0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch renamed from meta/recipes-core/systemd/systemd/0004-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch +9 -9
similarity index 77%
rename from meta/recipes-core/systemd/systemd/0004-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch
rename to meta/recipes-core/systemd/systemd/0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch
index cb5ae99..53037ea 100644
@@ -1,24 +1,24 @@
-From c850b654e71677e0d6292f1345207b9b5acffc33 Mon Sep 17 00:00:00 2001
+From efc57856f961c1f3bf016c511c53d990db8abdff Mon Sep 17 00:00:00 2001
 From: Emil Renner Berthing <[email protected]>
 Date: Mon, 23 Oct 2017 11:31:03 -0700
-Subject: [PATCH 04/12] src/basic/missing.h: check for missing __compar_fn_t
+Subject: [PATCH 16/31] src/basic/missing.h: check for missing __compar_fn_t
  typedef
 
 include missing.h for missing __compar_fn_t
 
-Signed-off-by: Khem Raj <[email protected]>
----
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <[email protected]>
+---
  src/basic/missing.h | 5 +++++
  src/basic/strbuf.c  | 1 +
  2 files changed, 6 insertions(+)
 
 diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 8009888ad..671f341c6 100644
+index 07a8c8364..1aee3346a 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -1063,6 +1063,11 @@ struct input_mask {
+@@ -1162,6 +1162,11 @@ struct input_mask {
  #define RENAME_NOREPLACE (1 << 0)
  #endif
  
@@ -31,10 +31,10 @@ index 8009888ad..671f341c6 100644
  #define KCMP_FILE 0
  #endif
 diff --git a/src/basic/strbuf.c b/src/basic/strbuf.c
-index 00aaf9e62..9dc4a584a 100644
+index 8befffa66..bcb860f95 100644
 --- a/src/basic/strbuf.c
 +++ b/src/basic/strbuf.c
-@@ -23,6 +23,7 @@
+@@ -24,6 +24,7 @@
  
  #include "alloc-util.h"
  #include "strbuf.h"
@@ -43,5 +43,5 @@ index 00aaf9e62..9dc4a584a 100644
  /*
   * Strbuf stores given strings in a single continuous allocated memory
 -- 
-2.14.2
+2.13.0
 
meta/recipes-core/systemd/systemd/0017-Include-netinet-if_ether.h.patch renamed from meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch +27 -28

111 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0018-check-for-missing-canonicalize_file_name.patch new file +47 -0

47 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0018-check-for-uchar.h-in-configure.patch deleted +0 -44

44 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch new file +29 -0
new file mode 100644
index 0000000..16b21a0
@@ -0,0 +1,29 @@
+From f5f313915d78bc43eb96e2aafb8ce3cda304c277 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Mon, 26 Feb 2018 17:27:56 +0800
+Subject: [PATCH 19/31] 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 1db8aa107..df3a1f5c5 100644
+--- a/src/test/meson.build
++++ b/src/test/meson.build
+@@ -646,7 +646,7 @@ tests += [
+         [['src/test/test-nss.c'],
+          [],
+          [libdl],
+-         '', 'manual'],
++         'ENABLE_NSS_SYSTEMD', 'manual'],
+ ]
+ 
+ ############################################################
+-- 
+2.13.0
+
meta/recipes-core/systemd/systemd/0020-test-hexdecoct.c-Include-missing.h-for-strndupa.patch renamed from meta/recipes-core/systemd/systemd/0009-test-hexdecoct.c-Include-missing.h-form-strndupa.patch +8 -7
similarity index 68%
rename from meta/recipes-core/systemd/systemd/0009-test-hexdecoct.c-Include-missing.h-form-strndupa.patch
rename to meta/recipes-core/systemd/systemd/0020-test-hexdecoct.c-Include-missing.h-for-strndupa.patch
index d3694dc..ad49cfe 100644
@@ -1,20 +1,21 @@
-From 75f4e7f167de533a160ee1af2a03fba4c5a5ffc6 Mon Sep 17 00:00:00 2001
+From d63d2fedcd80e58ee53655aeaf2836d4b0a14652 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Mon, 23 Oct 2017 12:33:22 -0700
-Subject: [PATCH 09/12] test-hexdecoct.c: Include missing.h form strndupa
+Subject: [PATCH 20/31] test-hexdecoct.c: Include missing.h for strndupa
 
-Signed-off-by: Khem Raj <[email protected]>
----
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <[email protected]>
+Signed-off-by: Chen Qi <[email protected]>
+---
  src/test/test-hexdecoct.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
-index fcae427e7..5eb5e2ed7 100644
+index 3e25a0bac..ab3e508f1 100644
 --- a/src/test/test-hexdecoct.c
 +++ b/src/test/test-hexdecoct.c
-@@ -21,6 +21,7 @@
+@@ -24,6 +24,7 @@
  #include "hexdecoct.h"
  #include "macro.h"
  #include "string-util.h"
@@ -23,5 +24,5 @@ index fcae427e7..5eb5e2ed7 100644
  static void test_hexchar(void) {
          assert_se(hexchar(0xa) == 'a');
 -- 
-2.14.2
+2.13.0
 
meta/recipes-core/systemd/systemd/0021-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch renamed from meta/recipes-core/systemd/systemd/0010-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch +16 -23
similarity index 49%
rename from meta/recipes-core/systemd/systemd/0010-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
rename to meta/recipes-core/systemd/systemd/0021-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
index 808c83a..9c8aeca 100644
@@ -1,29 +1,22 @@
-From 6e9d2bcaa6f886b2384c1c35a04e4ebc148aea68 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 23 Oct 2017 12:40:25 -0700
-Subject: [PATCH 10/12] test-sizeof.c: Disable tests for missing typedefs in
+From dfea4b98844795a0cd14fdaf40c67df389dbd27e Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Wed, 28 Feb 2018 21:25:22 -0800
+Subject: [PATCH 21/31] test-sizeof.c: Disable tests for missing typedefs in
  musl
 
-Signed-off-by: Khem Raj <[email protected]>
----
 Upstream-Status: Pending
 
- src/test/test-sizeof.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+Signed-off-by: Khem Raj <[email protected]>
+Signed-off-by: Chen Qi <[email protected]>
+---
+ src/test/test-sizeof.c | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
-index 269adfd18..ba7855dff 100644
+index aed6db842..0de6fa63c 100644
 --- a/src/test/test-sizeof.c
 +++ b/src/test/test-sizeof.c
-@@ -18,7 +18,6 @@
- ***/
- 
- #include <stdio.h>
--
- #include "time-util.h"
- 
- /* Print information about various types. Useful when diagnosing
-@@ -48,8 +47,10 @@ int main(void) {
+@@ -50,8 +50,10 @@ int main(void) {
          info(unsigned);
          info(long unsigned);
          info(long long unsigned);
@@ -34,16 +27,16 @@ index 269adfd18..ba7855dff 100644
  
          info(float);
          info(double);
-@@ -59,7 +60,9 @@ int main(void) {
+@@ -61,7 +63,9 @@ int main(void) {
          info(ssize_t);
          info(time_t);
          info(usec_t);
 +#ifdef __GLIBC__
          info(__time_t);
 +#endif
- 
-         info(enum Enum);
-         info(enum BigEnum);
+         info(pid_t);
+         info(uid_t);
+         info(gid_t);
 -- 
-2.14.2
+2.13.0
 
meta/recipes-core/systemd/systemd/0022-don-t-use-glibc-specific-qsort_r.patch renamed from meta/recipes-core/systemd/systemd/0011-don-t-use-glibc-specific-qsort_r.patch +13 -13
similarity index 88%
rename from meta/recipes-core/systemd/systemd/0011-don-t-use-glibc-specific-qsort_r.patch
rename to meta/recipes-core/systemd/systemd/0022-don-t-use-glibc-specific-qsort_r.patch
index 7cfe829..a5f7442 100644
@@ -1,21 +1,21 @@
-From 2eb45f5a0a8bfb8bdca084587ad28e5001f3cc4b Mon Sep 17 00:00:00 2001
+From d343757d629402c70ca8e5eaa551deaf175c96f3 Mon Sep 17 00:00:00 2001
 From: Emil Renner Berthing <[email protected]>
 Date: Thu, 18 Sep 2014 15:24:56 +0200
-Subject: [PATCH 11/12] don't use glibc-specific qsort_r
+Subject: [PATCH 22/31] don't use glibc-specific qsort_r
 
-Signed-off-by: Khem Raj <[email protected]>
----
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <[email protected]>
+---
  src/hwdb/hwdb.c         | 18 +++++++++++-------
  src/udev/udevadm-hwdb.c | 16 ++++++++++------
  2 files changed, 21 insertions(+), 13 deletions(-)
 
 diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
-index 793398ca6..669b00818 100644
+index 4540260f9..81aca7a9b 100644
 --- a/src/hwdb/hwdb.c
 +++ b/src/hwdb/hwdb.c
-@@ -151,13 +151,12 @@ static void trie_free(struct trie *trie) {
+@@ -152,13 +152,12 @@ static void trie_free(struct trie *trie) {
  
  DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free);
  
@@ -33,7 +33,7 @@ index 793398ca6..669b00818 100644
  }
  
  static int trie_node_add_value(struct trie *trie, struct trie_node *node,
-@@ -182,7 +181,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
+@@ -183,7 +182,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
                          .value_off = v,
                  };
  
@@ -45,7 +45,7 @@ index 793398ca6..669b00818 100644
                  if (val) {
                          /* At this point we have 2 identical properties on the same match-string.
                           * Since we process files in order, we just replace the previous value.
-@@ -207,7 +209,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
+@@ -208,7 +210,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
          node->values[node->values_count].file_priority = file_priority;
          node->values[node->values_count].line_number = line_number;
          node->values_count++;
@@ -57,10 +57,10 @@ index 793398ca6..669b00818 100644
  }
  
 diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
-index 69b0b9025..fbd213300 100644
+index ab5dc7ab6..c777e30ab 100644
 --- a/src/udev/udevadm-hwdb.c
 +++ b/src/udev/udevadm-hwdb.c
-@@ -128,13 +128,13 @@ static void trie_node_cleanup(struct trie_node *node) {
+@@ -130,13 +130,13 @@ static void trie_node_cleanup(struct trie_node *node) {
          free(node);
  }
  
@@ -78,7 +78,7 @@ index 69b0b9025..fbd213300 100644
  }
  
  static int trie_node_add_value(struct trie *trie, struct trie_node *node,
-@@ -155,7 +155,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
+@@ -157,7 +157,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
                          .value_off = v,
                  };
  
@@ -89,7 +89,7 @@ index 69b0b9025..fbd213300 100644
                  if (val) {
                          /* replace existing earlier key with new value */
                          val->value_off = v;
-@@ -172,7 +174,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
+@@ -174,7 +176,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
          node->values[node->values_count].key_off = k;
          node->values[node->values_count].value_off = v;
          node->values_count++;
@@ -101,5 +101,5 @@ index 69b0b9025..fbd213300 100644
  }
  
 -- 
-2.14.2
+2.13.0
 
meta/recipes-core/systemd/systemd/0023-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch renamed from meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +11 -11
similarity index 90%
rename from meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
rename to meta/recipes-core/systemd/systemd/0023-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
index 1a6db65..09c2b5c 100644
@@ -1,7 +1,7 @@
-From 9621618c701a2d5eb3e26f40c68354d4dfb8f872 Mon Sep 17 00:00:00 2001
+From 7b802ada1207ed00ed3867b9804dd0f316641b9b Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <[email protected]>
 Date: Tue, 10 Oct 2017 14:33:30 -0700
-Subject: [PATCH 12/12] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat()
+Subject: [PATCH 23/31] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat()
 
 Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right
 thing to do and it's not portable (not supported by musl). See:
@@ -22,19 +22,19 @@ The laccess() macros was added to systemd some time ago and it's not
 clear if or why it needs to return success for broken symlinks. Maybe
 just historical and not actually necessary or desired behaviour?
 
-Signed-off-by: Andre McCurdy <[email protected]>
----
 Upstream-Status: Pending
 
+Signed-off-by: Andre McCurdy <[email protected]>
+---
  src/basic/fs-util.h          | 22 +++++++++++++++++++++-
  src/shared/base-filesystem.c |  6 +++---
  2 files changed, 24 insertions(+), 4 deletions(-)
 
 diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
-index 094acf179..cdbc0ae72 100644
+index 4dba1ea56..9c4b02ecc 100644
 --- a/src/basic/fs-util.h
 +++ b/src/basic/fs-util.h
-@@ -48,7 +48,27 @@ int fchmod_umask(int fd, mode_t mode);
+@@ -50,7 +50,27 @@ int fchmod_umask(int fd, mode_t mode);
  
  int fd_warn_permissions(const char *path, int fd);
  
@@ -64,10 +64,10 @@ index 094acf179..cdbc0ae72 100644
  int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);
  int touch(const char *path);
 diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
-index 903a18786..2f6052ee7 100644
+index 3c25aa534..574ca71c7 100644
 --- a/src/shared/base-filesystem.c
 +++ b/src/shared/base-filesystem.c
-@@ -70,7 +70,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
+@@ -71,7 +71,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
                  return log_error_errno(errno, "Failed to open root file system: %m");
  
          for (i = 0; i < ELEMENTSOF(table); i ++) {
@@ -76,7 +76,7 @@ index 903a18786..2f6052ee7 100644
                          continue;
  
                  if (table[i].target) {
-@@ -78,7 +78,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
+@@ -79,7 +79,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
  
                          /* check if one of the targets exists */
                          NULSTR_FOREACH(s, table[i].target) {
@@ -85,7 +85,7 @@ index 903a18786..2f6052ee7 100644
                                          continue;
  
                                  /* check if a specific file exists at the target path */
-@@ -89,7 +89,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
+@@ -90,7 +90,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
                                          if (!p)
                                                  return log_oom();
  
@@ -95,5 +95,5 @@ index 903a18786..2f6052ee7 100644
                                  }
  
 -- 
-2.14.2
+2.13.0
 
meta/recipes-core/systemd/systemd/0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch renamed from meta/recipes-core/systemd/systemd/0013-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch +7 -7
similarity index 77%
rename from meta/recipes-core/systemd/systemd/0013-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch
rename to meta/recipes-core/systemd/systemd/0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch
index e219981..fe7e623 100644
@@ -1,23 +1,23 @@
-From 4b6733544beb662a0f77310302fae1fb7b76d167 Mon Sep 17 00:00:00 2001
+From 76c71aa889155f29be1d5d2b74a2c4faa5909c8c Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Sat, 12 Sep 2015 18:53:31 +0000
-Subject: [PATCH 13/13] comparison_fn_t is glibc specific, use raw signature in
+Subject: [PATCH 24/31] comparison_fn_t is glibc specific, use raw signature in
  function pointer
 
 make it work with musl where comparison_fn_t is not provided
 
-Signed-off-by: Khem Raj <[email protected]>
----
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <[email protected]>
+---
  src/basic/util.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/basic/util.h b/src/basic/util.h
-index c7da6c39b..87f62b891 100644
+index 9d1b10756..12db53a93 100644
 --- a/src/basic/util.h
 +++ b/src/basic/util.h
-@@ -98,7 +98,7 @@ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
+@@ -95,7 +95,7 @@ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
   * Normal qsort requires base to be nonnull. Here were require
   * that only if nmemb > 0.
   */
@@ -27,5 +27,5 @@ index c7da6c39b..87f62b891 100644
                  return;
  
 -- 
-2.14.2
+2.13.0
 
meta/recipes-core/systemd/systemd/0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch renamed from meta/recipes-core/systemd/systemd/0001-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch +8 -8
similarity index 80%
rename from meta/recipes-core/systemd/systemd/0001-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch
rename to meta/recipes-core/systemd/systemd/0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch
index 35599d4..9376a8f 100644
@@ -1,22 +1,22 @@
-From 3ca5326485cb19e775af6de615c17be66e44e472 Mon Sep 17 00:00:00 2001
+From a0b1496322f4d7ce83f4fbfd2a90b91d0721f643 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Tue, 24 Oct 2017 23:08:24 -0700
-Subject: [PATCH] Define _PATH_WTMPX and _PATH_UTMPX if not defined
+Subject: [PATCH 25/31] Define _PATH_WTMPX and _PATH_UTMPX if not defined
 
 Musl needs these defines
 
-Signed-off-by: Khem Raj <[email protected]>
----
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <[email protected]>
+---
  src/shared/utmp-wtmp.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
-index 9750dcd81..bd55d74a1 100644
+index cab1cd6a2..f5eedac18 100644
 --- a/src/shared/utmp-wtmp.c
 +++ b/src/shared/utmp-wtmp.c
-@@ -27,6 +27,7 @@
+@@ -28,6 +28,7 @@
  #include <sys/time.h>
  #include <sys/utsname.h>
  #include <unistd.h>
@@ -24,7 +24,7 @@ index 9750dcd81..bd55d74a1 100644
  #include <utmpx.h>
  
  #include "alloc-util.h"
-@@ -41,6 +42,13 @@
+@@ -42,6 +43,13 @@
  #include "util.h"
  #include "utmp-wtmp.h"
  
@@ -39,5 +39,5 @@ index 9750dcd81..bd55d74a1 100644
          struct utmpx *found, lookup = { .ut_type = RUN_LVL };
          int r;
 -- 
-2.14.3
+2.13.0
 
meta/recipes-core/systemd/systemd/0026-Use-uintmax_t-for-handling-rlim_t.patch renamed from meta/recipes-core/systemd/systemd/0001-Use-uintmax_t-for-handling-rlim_t.patch +11 -11
similarity index 89%
rename from meta/recipes-core/systemd/systemd/0001-Use-uintmax_t-for-handling-rlim_t.patch
rename to meta/recipes-core/systemd/systemd/0026-Use-uintmax_t-for-handling-rlim_t.patch
index 779dc78..46d75ad 100644
@@ -1,7 +1,7 @@
-From b2d4171c6e521cf1e70331fb769234d63a4a6d44 Mon Sep 17 00:00:00 2001
+From 88c48ea84db6fda19dfaeb64545fccf8fa0525ec Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 27 Oct 2017 13:00:41 -0700
-Subject: [PATCH] Use uintmax_t for handling rlim_t
+Subject: [PATCH 26/31] Use uintmax_t for handling rlim_t
 
 PRIu{32,64} is not right format to represent rlim_t type
 therefore use %ju and typecast the rlim_t variables to
@@ -15,20 +15,20 @@ execute.c:3446:36: error: format '%lu' expects argument of type 'long unsigned i
 |                                  prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max);
 |                                                               ~~~~~~~~~~~~~~~~~~~~~~
 
-Signed-off-by: Khem Raj <[email protected]>
----
 Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/7199]
 
+Signed-off-by: Khem Raj <[email protected]>
+---
  src/basic/format-util.h | 8 --------
  src/basic/rlimit-util.c | 8 ++++----
  src/core/execute.c      | 8 ++++----
  3 files changed, 8 insertions(+), 16 deletions(-)
 
 diff --git a/src/basic/format-util.h b/src/basic/format-util.h
-index ae42a8f89..144249cd6 100644
+index d9a78f781..9a1bc21d7 100644
 --- a/src/basic/format-util.h
 +++ b/src/basic/format-util.h
-@@ -60,14 +60,6 @@
+@@ -61,14 +61,6 @@
  #  define PRI_TIMEX "li"
  #endif
  
@@ -44,10 +44,10 @@ index ae42a8f89..144249cd6 100644
  #  define DEV_FMT "%" PRIu64
  #elif SIZEOF_DEV_T == 4
 diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
-index ca834df62..41fcebb74 100644
+index 00648211d..df3d9ecc1 100644
 --- a/src/basic/rlimit-util.c
 +++ b/src/basic/rlimit-util.c
-@@ -284,13 +284,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) {
+@@ -286,13 +286,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) {
          if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY)
                  s = strdup("infinity");
          else if (rl->rlim_cur >= RLIM_INFINITY)
@@ -66,10 +66,10 @@ index ca834df62..41fcebb74 100644
          if (!s)
                  return -ENOMEM;
 diff --git a/src/core/execute.c b/src/core/execute.c
-index d72e5bf08..d38946002 100644
+index 0df3971df..aabdddb68 100644
 --- a/src/core/execute.c
 +++ b/src/core/execute.c
-@@ -3443,10 +3443,10 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
+@@ -3991,10 +3991,10 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
  
          for (i = 0; i < RLIM_NLIMITS; i++)
                  if (c->rlimit[i]) {
@@ -85,5 +85,5 @@ index d72e5bf08..d38946002 100644
  
          if (c->ioprio_set) {
 -- 
-2.14.3
+2.13.0
 
meta/recipes-core/systemd/systemd/0027-remove-nobody-user-group-checking.patch new file +63 -0

63 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch new file +50 -0

50 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0029-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch new file +43 -0

43 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch new file +45 -0

45 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch new file +30 -0
new file mode 100644
index 0000000..319c4b6
@@ -0,0 +1,30 @@
+From adcd7e426fcd80e754274a730221d1a1f49dbc21 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Tue, 27 Feb 2018 14:01:30 +0800
+Subject: [PATCH 31/31] fix missing ULONG_LONG_MAX definition in case of musl
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ src/basic/missing.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index 5b9fde692..a922f1346 100644
+--- a/src/basic/missing.h
++++ b/src/basic/missing.h
+@@ -72,6 +72,10 @@ struct sockaddr_vm {
+ };
+ #endif /* !HAVE_LINUX_VM_SOCKETS_H */
+ 
++#ifndef ULONG_LONG_MAX
++#define ULONG_LONG_MAX ULLONG_MAX
++#endif
++
+ #ifndef RLIMIT_RTTIME
+ #define RLIMIT_RTTIME 15
+ #endif
+-- 
+2.13.0
+
meta/recipes-core/systemd/systemd/run-ptest deleted +0 -6
deleted file mode 100644
index 2ae76ff..0000000
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-cd tests
-tar -C test -xJf test/sys.tar.xz
-make check-TESTS
-cd ..
meta/recipes-core/systemd/systemd_237.bb renamed from meta/recipes-core/systemd/systemd_234.bb +104 -162

200 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
#3 lore raw

PATCH 3/4 systemd: fix build failure for qemux86 and qemuppc with musl

In reply to Chen Qi

Remove the 'fstack-protector' and 'fstack-protector-strong' flags as a workaround to fix the following error when building for qemux86 and qemuppc with musl.

undefined reference to `__stack_chk_fail_local'

---
 ...ck-protector-flags-to-workaround-musl-bui.patch | 33 ++++++++++++++++++++++
 meta/recipes-core/systemd/systemd_237.bb           |  4 +++
 2 files changed, 37 insertions(+)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch new file +33 -0
new file mode 100644
index 0000000..e913e3f
@@ -0,0 +1,33 @@
+From e361f6b4aefae57efff7e457df8db4d1067bec23 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Wed, 28 Feb 2018 21:50:23 -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 [OE 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 7610ab12b..591b9cbab 100644
+--- a/meson.build
++++ b/meson.build
+@@ -329,8 +329,6 @@ foreach arg : ['-Wextra',
+                '-fdiagnostics-show-option',
+                '-fno-strict-aliasing',
+                '-fvisibility=hidden',
+-               '-fstack-protector',
+-               '-fstack-protector-strong',
+                '--param=ssp-buffer-size=4',
+               ]
+         if cc.has_argument(arg)
+-- 
+2.13.0
+
meta/recipes-core/systemd/systemd_237.bb +4 -0
index 283995b..bcf4d56 100644
@@ -52,6 +52,10 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \
            "
 SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"
 
+# Workaround undefined reference to `__stack_chk_fail_local' on qemux86 and qemuppc for musl
+SRC_URI_append_libc-musl_qemux86 = " file://0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch"
+SRC_URI_append_libc-musl_qemuppc = " file://0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch"
+
 PAM_PLUGINS = " \
     pam-plugin-unix \
     pam-plugin-loginuid \
Signature · 1 line
1.9.1
author
#4 lore raw

PATCH 4/4 systemd-boot: upgrade to 237

In reply to Chen Qi

Upgrade systemd-boot to 237.

As systemd has dropped autotools support, fix configure and compile failures related to meson.

---
 .../{systemd-boot_234.bb => systemd-boot_237.bb}   | 32 ++++++-----
 ...01-Also-check-i386-i586-and-i686-for-ia32.patch | 28 ++++++++++
 ...efi_cc-and-efi_ld-correctly-when-cross-co.patch | 62 ++++++++++++++++++++++
 3 files changed, 109 insertions(+), 13 deletions(-)
 rename meta/recipes-core/systemd/{systemd-boot_234.bb => systemd-boot_237.bb} (41%)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
meta/recipes-core/systemd/systemd-boot_237.bb renamed from meta/recipes-core/systemd/systemd-boot_234.bb +19 -13
similarity index 41%
rename from meta/recipes-core/systemd/systemd-boot_234.bb
rename to meta/recipes-core/systemd/systemd-boot_237.bb
index 88a14ac..ec87cbf 100644
@@ -3,20 +3,27 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
 
 DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
 
-SRC_URI += "file://0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch"
+SRC_URI += "file://0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \
+            file://0027-remove-nobody-user-group-checking.patch \
+            file://0001-Also-check-i386-i586-and-i686-for-ia32.patch \
+            file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \
+            "
 
-inherit autotools pkgconfig gettext
+inherit meson pkgconfig gettext
 inherit deploy
 
 EFI_CC ?= "${CC}"
-# Man pages are packaged through the main systemd recipe
-EXTRA_OECONF = " --enable-gnuefi \
-                 --with-efi-includedir=${STAGING_INCDIR} \
-                 --with-efi-ldsdir=${STAGING_LIBDIR} \
-                 --with-efi-libdir=${STAGING_LIBDIR} \
-                 --disable-manpages \
-                 EFI_CC='${EFI_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-ld='${LD}' \
+                  "
+
 
 # Imported from the old gummiboot recipe
 TUNE_CCARGS_remove = "-mfpmath=sse"
@@ -28,8 +35,7 @@ do_compile() {
 	if [ "${TARGET_ARCH}" = "x86_64" ]; then
 		SYSTEMD_BOOT_EFI_ARCH="x64"
 	fi
-
-	oe_runmake systemd-boot${SYSTEMD_BOOT_EFI_ARCH}.efi
+	ninja src/boot/efi/systemd-boot${SYSTEMD_BOOT_EFI_ARCH}.efi
 }
 
 do_install() {
@@ -38,6 +44,6 @@ do_install() {
 }
 
 do_deploy () {
-	install ${B}/systemd-boot*.efi ${DEPLOYDIR}
+	install ${B}/src/boot/efi/systemd-boot*.efi ${DEPLOYDIR}
 }
 addtask deploy before do_build after do_compile
meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch new file +28 -0
new file mode 100644
index 0000000..877bb1c
@@ -0,0 +1,28 @@
+From 3e8c19bb1bbc4493c591f75c00c1fefe3b1c8a69 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Tue, 27 Feb 2018 20:42:41 -0800
+Subject: [PATCH] Also check i386, i586 and i686 for ia32
+
+Upstream-Status: Pending
+
+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 28cb8b60e..489531a43 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1217,7 +1217,7 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', slow_tests)
+ if get_option('efi')
+         efi_arch = host_machine.cpu_family()
+ 
+-        if efi_arch == 'x86'
++        if efi_arch == 'x86' or efi_arch == 'i386' or efi_arch == 'i586' or efi_arch == 'i686'
+                 EFI_MACHINE_TYPE_NAME = 'ia32'
+                 gnu_efi_arch = 'ia32'
+         elif efi_arch == 'x86_64'
+-- 
+2.13.0
+
meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch new file +62 -0

62 lines not on this page · raw message

Signature · 1 line
1.9.1
#5 lore raw

Re: [PATCH 4/4] systemd-boot: upgrade to 237

Can you rebase this to master as there's been changes to booting made.

Ross

Quoted 214 lines · Chen Qi

Upgrade systemd-boot to 237.

As systemd has dropped autotools support, fix configure and compile failures related to meson.

---
 .../{systemd-boot_234.bb => systemd-boot_237.bb}   | 32 ++++++-----
 ...01-Also-check-i386-i586-and-i686-for-ia32.patch | 28 ++++++++++
 ...efi_cc-and-efi_ld-correctly-when-cross-co.patch | 62
++++++++++++++++++++++
 3 files changed, 109 insertions(+), 13 deletions(-)
 rename meta/recipes-core/systemd/{systemd-boot_234.bb =>
systemd-boot_237.bb} (41%)
 create mode 100644 meta/recipes-core/systemd/
systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_

cc-and-efi_ld-correctly-when-cross-co.patch

meta/recipes-core/systemd/systemd-boot_237.bb renamed from meta/recipes-core/systemd/systemd-boot_234.bb +0 -1
similarity index 41%
rename from meta/recipes-core/systemd/systemd-boot_234.bb
rename to meta/recipes-core/systemd/systemd-boot_237.bb
index 88a14ac..ec87cbf 100644
@@ -3,20 +3,27 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
 
 DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
 
-SRC_URI += "file://0007-use-lnr-wrapper-instead-of-looking-for-

relative-opti.patch"
+SRC_URI += "file://0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \

meta/recipes-core/systemd/systemd-boot_237.bb renamed from meta/recipes-core/systemd/systemd-boot_234.bb +3 -0
+            file://0027-remove-nobody-user-group-checking.patch \
+            file://0001-Also-check-i386-i586-and-i686-for-ia32.patch \
+            file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch

\

meta/recipes-core/systemd/systemd-boot_237.bb renamed from meta/recipes-core/systemd/systemd-boot_234.bb +15 -12
+            "
 
-inherit autotools pkgconfig gettext
+inherit meson pkgconfig gettext
 inherit deploy
 
 EFI_CC ?= "${CC}"
-# Man pages are packaged through the main systemd recipe
-EXTRA_OECONF = " --enable-gnuefi \
-                 --with-efi-includedir=${STAGING_INCDIR} \
-                 --with-efi-ldsdir=${STAGING_LIBDIR} \
-                 --with-efi-libdir=${STAGING_LIBDIR} \
-                 --disable-manpages \
-                 EFI_CC='${EFI_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-ld='${LD}' \
+                  "
+
 
 # Imported from the old gummiboot recipe
 TUNE_CCARGS_remove = "-mfpmath=sse"
@@ -28,8 +35,7 @@ do_compile() {
        if [ "${TARGET_ARCH}" = "x86_64" ]; then
                SYSTEMD_BOOT_EFI_ARCH="x64"
        fi
-
-       oe_runmake systemd-boot${SYSTEMD_BOOT_EFI_ARCH}.efi
+       ninja src/boot/efi/systemd-boot${SYSTEMD_BOOT_EFI_ARCH}.efi
 }
 
 do_install() {
@@ -38,6 +44,6 @@ do_install() {
 }
 
 do_deploy () {
-       install ${B}/systemd-boot*.efi ${DEPLOYDIR}
+       install ${B}/src/boot/efi/systemd-boot*.efi ${DEPLOYDIR}
 }
 addtask deploy before do_build after do_compile
meta/recipes-core/systemd/systemd/0001-Also-check-i386- renamed from meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch +0 -0

i586-and-i686-for-ia32.patch
new file mode 100644
index 0000000..877bb1c

meta/recipes-core/systemd/systemd/0001-Also-check-i386- new file +0 -0

i586-and-i686-for-ia32.patch

meta/recipes-core/systemd/systemd/0001-Also-check-i386- new file +17 -0
@@ -0,0 +1,28 @@
+From 3e8c19bb1bbc4493c591f75c00c1fefe3b1c8a69 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Tue, 27 Feb 2018 20:42:41 -0800
+Subject: [PATCH] Also check i386, i586 and i686 for ia32
+
+Upstream-Status: Pending
+
+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 28cb8b60e..489531a43 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1217,7 +1217,7 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT',

slow_tests)
+ if get_option('efi')

meta/recipes-core/systemd/systemd/0001-Also-check-i386- new file +4 -0
+         efi_arch = host_machine.cpu_family()
+
+-        if efi_arch == 'x86'
++        if efi_arch == 'x86' or efi_arch == 'i386' or efi_arch == 'i586'

or efi_arch == 'i686'

meta/recipes-core/systemd/systemd/0001-Also-check-i386- new file +6 -0
+                 EFI_MACHINE_TYPE_NAME = 'ia32'
+                 gnu_efi_arch = 'ia32'
+         elif efi_arch == 'x86_64'
+--
+2.13.0
+
(quoted diff) +0 -0

cc-and-efi_ld-correctly-when-cross-co.patch b/meta/recipes-core/systemd/ systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch new file mode 100644
index 0000000..e2e19ba

meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_ new file +0 -0

cc-and-efi_ld-correctly-when-cross-co.patch

meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_ new file +4 -0
@@ -0,0 +1,62 @@
+From 527413ec243564a89ffaad6368d446de44415970 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Tue, 27 Feb 2018 21:42:23 -0800
+Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when

cross-compiling

meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_ new file +23 -0
+
+When cross-compiling, efi_cc and efi_ld may take the form of
+'xxx-gcc --sysroot=xxx', and this would cause run_command and
+the alike fail.
+
+Fix to split them to make commands run correctly.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ src/boot/efi/meson.build | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
+index 992a3ba4c..9f9ec4911 100644
+--- a/src/boot/efi/meson.build
++++ b/src/boot/efi/meson.build
+@@ -157,7 +157,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.split() + ['-c',
'@INPUT@', '-o', '@OUTPUT@']

meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_ new file +3 -0
+                                                  + compile_args,
+                                        depend_files : efi_headers)
+                 if (common_sources + systemd_boot_sources).

contains(file)
+@@ -168,7 +168,17 @@ if have_gnu_efi

meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_ new file +4 -0
+                 endif
+         endforeach
+
+-        libgcc_file_name = run_command(efi_cc,

'-print-libgcc-file-name').stdout().strip()

++        find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name'
++        find_libgcc_cmd = find_libgcc_cmd_all.split()[0]
++        find_libgcc_args = []
++        cmd_args_all = find_libgcc_cmd_all.split()
++        foreach arg : cmd_args_all

++ if arg != find_libgcc_cmd
++ find_libgcc_args += arg
++ endif
++ endforeach
++
++ libgcc_file_name = run_command(find_libgcc_cmd,
find_libgcc_args).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)

meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_ new file +9 -0
+         no_undefined_symbols = find_program('no-undefined-symbols.sh')
+@@ -179,7 +189,7 @@ if have_gnu_efi
+                         tuple[0],
+                         input : tuple[2],
+                         output : tuple[0],
+-                        command : [efi_ld, '-o', '@OUTPUT@'] +
++                        command : efi_ld.split() + ['-o', '@OUTPUT@'] +
+                                   efi_ldflags + tuple[2] +
+                                   ['-lefi', '-lgnuefi',

libgcc_file_name])

meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_ new file +4 -1
+
+--
+2.13.0
+
--

1.9.1

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

author
#6 lore raw

Re: [PATCH 4/4] systemd-boot: upgrade to 237

Quoted 4 lines · Ross

Can you rebase this to master as there's been changes to booting made.

Ross

Hi Ross,

I've done this.
The remote branch has been updated.

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

Best Regards,
Chen Qi

Quoted 237 lines · On 5 March 2018 at 02:02, Chen Qi <[email protected]…
    Upgrade systemd-boot to 237.

    As systemd has dropped autotools support, fix configure and compile
    failures related to meson.

    Signed-off-by: Chen Qi <[email protected]
    <mailto:[email protected]>>
    ---
     .../{systemd-boot_234.bb <http://systemd-boot_234.bb> =>
    systemd-boot_237.bb <http://systemd-boot_237.bb>}  | 32 ++++++-----
     ...01-Also-check-i386-i586-and-i686-for-ia32.patch | 28 ++++++++++
     ...efi_cc-and-efi_ld-correctly-when-cross-co.patch | 62
    ++++++++++++++++++++++
     3 files changed, 109 insertions(+), 13 deletions(-)
     rename meta/recipes-core/systemd/{systemd-boot_234.bb
    <http://systemd-boot_234.bb> => systemd-boot_237.bb
    <http://systemd-boot_237.bb>} (41%)
     create mode 100644
    meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
     create mode 100644
    meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch

    diff --git a/meta/recipes-core/systemd/systemd-boot_234.bb
    <http://systemd-boot_234.bb>
    b/meta/recipes-core/systemd/systemd-boot_237.bb
    <http://systemd-boot_237.bb>
    similarity index 41%
    rename from meta/recipes-core/systemd/systemd-boot_234.bb
    <http://systemd-boot_234.bb>
    rename to meta/recipes-core/systemd/systemd-boot_237.bb
    <http://systemd-boot_237.bb>
    index 88a14ac..ec87cbf 100644
    --- a/meta/recipes-core/systemd/systemd-boot_234.bb
    <http://systemd-boot_234.bb>
    +++ b/meta/recipes-core/systemd/systemd-boot_237.bb
    <http://systemd-boot_237.bb>
    @@ -3,20 +3,27 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"

     DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"

    -SRC_URI +=
    "file://0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch"
    +SRC_URI +=
    "file://0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
    \
    +            file://0027-remove-nobody-user-group-checking.patch \
    +           
    file://0001-Also-check-i386-i586-and-i686-for-ia32.patch \
    +           
    file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
    \
    +            "

    -inherit autotools pkgconfig gettext
    +inherit meson pkgconfig gettext
     inherit deploy

     EFI_CC ?= "${CC}"
    -# Man pages are packaged through the main systemd recipe
    -EXTRA_OECONF = " --enable-gnuefi \
    -                 --with-efi-includedir=${STAGING_INCDIR} \
    -                 --with-efi-ldsdir=${STAGING_LIBDIR} \
    -                 --with-efi-libdir=${STAGING_LIBDIR} \
    -                 --disable-manpages \
    -                 EFI_CC='${EFI_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-ld='${LD}' \
    +                  "
    +

     # Imported from the old gummiboot recipe
     TUNE_CCARGS_remove = "-mfpmath=sse"
    @@ -28,8 +35,7 @@ do_compile() {
            if [ "${TARGET_ARCH}" = "x86_64" ]; then
                    SYSTEMD_BOOT_EFI_ARCH="x64"
            fi
    -
    -       oe_runmake systemd-boot${SYSTEMD_BOOT_EFI_ARCH}.efi
    +       ninja src/boot/efi/systemd-boot${SYSTEMD_BOOT_EFI_ARCH}.efi
     }

     do_install() {
    @@ -38,6 +44,6 @@ do_install() {
     }

     do_deploy () {
    -       install ${B}/systemd-boot*.efi ${DEPLOYDIR}
    +       install ${B}/src/boot/efi/systemd-boot*.efi ${DEPLOYDIR}
     }
     addtask deploy before do_build after do_compile
    diff --git
    a/meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
    b/meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
    new file mode 100644
    index 0000000..877bb1c
    --- /dev/null
    +++
    b/meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
    @@ -0,0 +1,28 @@
    +From 3e8c19bb1bbc4493c591f75c00c1fefe3b1c8a69 Mon Sep 17 00:00:00
    2001
    +From: Chen Qi <[email protected] <mailto:[email protected]>>
    +Date: Tue, 27 Feb 2018 20:42:41 -0800
    +Subject: [PATCH] Also check i386, i586 and i686 for ia32
    +
    +Upstream-Status: Pending
    +
    +Signed-off-by: Chen Qi <[email protected]
    <mailto:[email protected]>>
    +---
    + meson.build | 2 +-
    + 1 file changed, 1 insertion(+), 1 deletion(-)
    +
    +diff --git a/meson.build b/meson.build
    +index 28cb8b60e..489531a43 100644
    +--- a/meson.build
    ++++ b/meson.build
    +@@ -1217,7 +1217,7 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT',
    slow_tests)
    + if get_option('efi')
    +         efi_arch = host_machine.cpu_family()
    +
    +-        if efi_arch == 'x86'
    ++        if efi_arch == 'x86' or efi_arch == 'i386' or efi_arch
    == 'i586' or efi_arch == 'i686'
    +                 EFI_MACHINE_TYPE_NAME = 'ia32'
    +                 gnu_efi_arch = 'ia32'
    +         elif efi_arch == 'x86_64'
    +--
    +2.13.0
    +
    diff --git
    a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
    b/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
    new file mode 100644
    index 0000000..e2e19ba
    --- /dev/null
    +++
    b/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
    @@ -0,0 +1,62 @@
    +From 527413ec243564a89ffaad6368d446de44415970 Mon Sep 17 00:00:00
    2001
    +From: Chen Qi <[email protected] <mailto:[email protected]>>
    +Date: Tue, 27 Feb 2018 21:42:23 -0800
    +Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when
    cross-compiling
    +
    +When cross-compiling, efi_cc and efi_ld may take the form of
    +'xxx-gcc --sysroot=xxx', and this would cause run_command and
    +the alike fail.
    +
    +Fix to split them to make commands run correctly.
    +
    +Upstream-Status: Pending
    +
    +Signed-off-by: Chen Qi <[email protected]
    <mailto:[email protected]>>
    +---
    + src/boot/efi/meson.build | 16 +++++++++++++---
    + 1 file changed, 13 insertions(+), 3 deletions(-)
    +
    +diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
    +index 992a3ba4c..9f9ec4911 100644
    +--- a/src/boot/efi/meson.build
    ++++ b/src/boot/efi/meson.build
    +@@ -157,7 +157,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.split()
    + ['-c', '@INPUT@', '-o', '@OUTPUT@']
    +                                                  + compile_args,
    +                                        depend_files : efi_headers)
    +                 if (common_sources +
    systemd_boot_sources).contains(file)
    +@@ -168,7 +168,17 @@ if have_gnu_efi
    +                 endif
    +         endforeach
    +
    +-        libgcc_file_name = run_command(efi_cc,
    '-print-libgcc-file-name').stdout().strip()
    ++        find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name'
    ++        find_libgcc_cmd = find_libgcc_cmd_all.split()[0]
    ++        find_libgcc_args = []
    ++        cmd_args_all = find_libgcc_cmd_all.split()
    ++        foreach arg : cmd_args_all
    ++                if arg != find_libgcc_cmd
    ++                        find_libgcc_args += arg
    ++                endif
    ++        endforeach
    ++
    ++        libgcc_file_name = run_command(find_libgcc_cmd,
    find_libgcc_args).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')
    +@@ -179,7 +189,7 @@ if have_gnu_efi
    +                         tuple[0],
    +                         input : tuple[2],
    +                         output : tuple[0],
    +-                        command : [efi_ld, '-o', '@OUTPUT@'] +
    ++                        command : efi_ld.split() + ['-o',
    '@OUTPUT@'] +
    +                                   efi_ldflags + tuple[2] +
    +                                   ['-lefi', '-lgnuefi',
    libgcc_file_name])
    +
    +--
    +2.13.0
    +
    --
    1.9.1

    --
    _______________________________________________
    Openembedded-core mailing list
    [email protected]
    <mailto:[email protected]>
    http://lists.openembedded.org/mailman/listinfo/openembedded-core
    <http://lists.openembedded.org/mailman/listinfo/openembedded-core>
#7 lore raw
In reply to Chen Qi
Quoted 7 lines · Chen Qi

Changes from last patchset (236 upgrading):
1. Use more vars (AR, NM, etc.) than just CC and LD in meson.bbclass.
2. Keep the PACKAGECONFIG item's name 'manpages' for compatibility.
3. Make it check for all i*86 archs instead of just i586 for systemd-boot.
4. Fix the '==' bashism in systemd-boot.
5. Rebase patches for 237.

before I try it out wanted to know if you tested it on musl targets ?

Quoted 126 lines

The following changes since commit bd5424f5b05a0a65471a77632efe7b9907370217:

maintainers.inc: add myself as maintainer for the new busybox-inittab (2018-03-04 21:23:03 +0000)

are available in the git repository at:

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

Chen Qi (4):
meson.bbclass: fix to build for more projects
systemd: upgrade to 237
systemd: fix build failure for qemux86 and qemuppc with musl
systemd-boot: upgrade to 237

 meta/classes/meson.bbclass                         |  20 +-
 .../{systemd-boot_234.bb => systemd-boot_237.bb}   |  32 ++-
 meta/recipes-core/systemd/systemd.inc              |   2 +-
 ...01-Also-check-i386-i586-and-i686-for-ia32.patch |  28 +++
 ...efi_cc-and-efi_ld-correctly-when-cross-co.patch |  62 +++++
 ...ck-protector-flags-to-workaround-musl-bui.patch |  33 +++
 ...v-when-secure-versions-are-not-available.patch} |  21 +-
 ...te-presets-after-generators-have-run-6526.patch |  69 ------
 ...any-initialization-steps-when-running-in-.patch | 163 -------------
 ...update-header-file-to-detect-memfd_create.patch |  28 ---
 ...t-install-dependency-links-at-install-tim.patch |  81 +++++++
 ...c-Check-if-memfd_create-is-already-define.patch |  27 ---
 .../systemd/0003-fileio-include-sys-mman.h.patch   |  26 --
 ...pper-instead-of-looking-for-relative-opti.patch |  64 +++++
 ...004-implment-systemd-sysv-install-for-OE.patch} |   8 +-
 ...t-install-dependency-links-at-install-tim.patch |  74 ------
 ...patch => 0005-rules-whitelist-hd-devices.patch} |   9 +-
 ...6-Make-root-s-home-directory-configurable.patch |  78 ++++++
 ...vert-rules-remove-firmware-loading-rules.patch} |   8 +-
 ...-check-for-missing-canonicalize_file_name.patch |  63 -----
 ...pper-instead-of-looking-for-relative-opti.patch |  40 ---
 .../systemd/0008-Do-not-enable-nss-tests.patch     |  35 ---
 ...remove-userspace-firmware-loading-suppor.patch} | 204 +++++++++-------
 ...=> 0009-remove-duplicate-include-uchar.h.patch} |  14 +-
 .../0010-check-for-uchar.h-in-meson.build.patch    |  45 ++++
 ...nes-Build-conditionally-when-HAVE_MYHOSTN.patch |  38 ---
 ...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} |  26 +-
 ...es-watch-metadata-changes-in-ide-devices.patch} |   8 +-
 ...3-Make-root-s-home-directory-configurable.patch | 155 ------------
 ...lback-parse_printf_format-implementation.patch} |  86 ++++---
 ...sic-missing.h-check-for-missing-strndupa.patch} |  96 ++++----
 ...f-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} |  30 +--
 ...ssing.h-check-for-missing-__compar_fn_t-.patch} |  18 +-
 ...patch => 0017-Include-netinet-if_ether.h.patch} |  55 +++--
 ...-check-for-missing-canonicalize_file_name.patch |  47 ++++
 .../0018-check-for-uchar.h-in-configure.patch      |  44 ----
 ...le-nss-tests-if-nss-systemd-is-not-enable.patch |  29 +++
 ...xdecoct.c-Include-missing.h-for-strndupa.patch} |  15 +-
 ...c-Disable-tests-for-missing-typedefs-in-.patch} |  39 ++-
 ...=> 0022-don-t-use-glibc-specific-qsort_r.patch} |  26 +-
 ...ss-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} |  22 +-
 ...n_t-is-glibc-specific-use-raw-signature-.patch} |  14 +-
 ...ATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} |  16 +-
 ...> 0026-Use-uintmax_t-for-handling-rlim_t.patch} |  22 +-
 .../0027-remove-nobody-user-group-checking.patch   |  63 +++++
 .../0028-add-missing-FTW_-macros-for-musl.patch    |  50 ++++
 ...nes-Build-conditionally-when-ENABLE_MYHOS.patch |  43 ++++
 ...-of-__register_atfork-for-non-glibc-build.patch |  45 ++++
 ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch |  30 +++
 meta/recipes-core/systemd/systemd/run-ptest        |   6 -
 .../systemd/{systemd_234.bb => systemd_237.bb}     | 270 +++++++++------------
 51 files changed, 1220 insertions(+), 1307 deletions(-)
 rename meta/recipes-core/systemd/{systemd-boot_234.bb => systemd-boot_237.bb} (41%)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
 rename meta/recipes-core/systemd/systemd/{0004-Use-getenv-when-secure-versions-are-not-available.patch => 0001-Use-getenv-when-secure-versions-are-not-available.patch} (53%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-main-skip-many-initialization-steps-when-running-in-.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
 rename meta/recipes-core/systemd/systemd/{0010-implment-systemd-sysv-install-for-OE.patch => 0004-implment-systemd-sysv-install-for-OE.patch} (89%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
 rename meta/recipes-core/systemd/systemd/{0012-rules-whitelist-hd-devices.patch => 0005-rules-whitelist-hd-devices.patch} (89%)
 create mode 100644 meta/recipes-core/systemd/systemd/0006-Make-root-s-home-directory-configurable.patch
 rename meta/recipes-core/systemd/systemd/{0014-Revert-rules-remove-firmware-loading-rules.patch => 0007-Revert-rules-remove-firmware-loading-rules.patch} (81%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0007-check-for-missing-canonicalize_file_name.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0008-Do-not-enable-nss-tests.patch
 rename meta/recipes-core/systemd/systemd/{0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch => 0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch} (63%)
 rename meta/recipes-core/systemd/systemd/{0017-remove-duplicate-include-uchar.h.patch => 0009-remove-duplicate-include-uchar.h.patch} (78%)
 create mode 100644 meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
 rename meta/recipes-core/systemd/systemd/{0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch => 0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch} (58%)
 rename meta/recipes-core/systemd/systemd/{0020-rules-watch-metadata-changes-in-ide-devices.patch => 0012-rules-watch-metadata-changes-in-ide-devices.patch} (90%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
 rename meta/recipes-core/systemd/systemd/{0001-add-fallback-parse_printf_format-implementation.patch => 0013-add-fallback-parse_printf_format-implementation.patch} (88%)
 rename meta/recipes-core/systemd/systemd/{0002-src-basic-missing.h-check-for-missing-strndupa.patch => 0014-src-basic-missing.h-check-for-missing-strndupa.patch} (47%)
 rename meta/recipes-core/systemd/systemd/{0003-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} (88%)
 rename meta/recipes-core/systemd/systemd/{0004-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch => 0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch} (77%)
 rename meta/recipes-core/systemd/systemd/{0006-Include-netinet-if_ether.h.patch => 0017-Include-netinet-if_ether.h.patch} (67%)
 create mode 100644 meta/recipes-core/systemd/systemd/0018-check-for-missing-canonicalize_file_name.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0018-check-for-uchar.h-in-configure.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
 rename meta/recipes-core/systemd/systemd/{0009-test-hexdecoct.c-Include-missing.h-form-strndupa.patch => 0020-test-hexdecoct.c-Include-missing.h-for-strndupa.patch} (68%)
 rename meta/recipes-core/systemd/systemd/{0010-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch => 0021-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch} (49%)
 rename meta/recipes-core/systemd/systemd/{0011-don-t-use-glibc-specific-qsort_r.patch => 0022-don-t-use-glibc-specific-qsort_r.patch} (88%)
 rename meta/recipes-core/systemd/systemd/{0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch => 0023-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} (90%)
 rename meta/recipes-core/systemd/systemd/{0013-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch => 0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch} (77%)
 rename meta/recipes-core/systemd/systemd/{0001-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch => 0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} (80%)
 rename meta/recipes-core/systemd/systemd/{0001-Use-uintmax_t-for-handling-rlim_t.patch => 0026-Use-uintmax_t-for-handling-rlim_t.patch} (89%)
 create mode 100644 meta/recipes-core/systemd/systemd/0027-remove-nobody-user-group-checking.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0029-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/run-ptest
 rename meta/recipes-core/systemd/{systemd_234.bb => systemd_237.bb} (71%)

--
1.9.1

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

author
#8 lore raw
Quoted 9 lines · Khem Raj
Quoted 7 lines · Chen Qi

Changes from last patchset (236 upgrading):
1. Use more vars (AR, NM, etc.) than just CC and LD in meson.bbclass.
2. Keep the PACKAGECONFIG item's name 'manpages' for compatibility.
3. Make it check for all i*86 archs instead of just i586 for systemd-boot.
4. Fix the '==' bashism in systemd-boot.
5. Rebase patches for 237.

before I try it out wanted to know if you tested it on musl targets ?

Yes.

For building test, I built all qemu archs for musl.
For booting test, I booted qemux86-64 and qemux86 for musl. For other archs, I didn't do booting test for musl.

Best Regards,
Chen Qi

Quoted 126 lines
Quoted 126 lines

The following changes since commit bd5424f5b05a0a65471a77632efe7b9907370217:

   maintainers.inc: add myself as maintainer for the new busybox-inittab (2018-03-04 21:23:03 +0000)

are available in the git repository at:

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

Chen Qi (4):
meson.bbclass: fix to build for more projects
systemd: upgrade to 237
systemd: fix build failure for qemux86 and qemuppc with musl
systemd-boot: upgrade to 237

  meta/classes/meson.bbclass                         |  20 +-
  .../{systemd-boot_234.bb => systemd-boot_237.bb}   |  32 ++-
  meta/recipes-core/systemd/systemd.inc              |   2 +-
  ...01-Also-check-i386-i586-and-i686-for-ia32.patch |  28 +++
  ...efi_cc-and-efi_ld-correctly-when-cross-co.patch |  62 +++++
  ...ck-protector-flags-to-workaround-musl-bui.patch |  33 +++
  ...v-when-secure-versions-are-not-available.patch} |  21 +-
  ...te-presets-after-generators-have-run-6526.patch |  69 ------
  ...any-initialization-steps-when-running-in-.patch | 163 -------------
  ...update-header-file-to-detect-memfd_create.patch |  28 ---
  ...t-install-dependency-links-at-install-tim.patch |  81 +++++++
  ...c-Check-if-memfd_create-is-already-define.patch |  27 ---
  .../systemd/0003-fileio-include-sys-mman.h.patch   |  26 --
  ...pper-instead-of-looking-for-relative-opti.patch |  64 +++++
  ...004-implment-systemd-sysv-install-for-OE.patch} |   8 +-
  ...t-install-dependency-links-at-install-tim.patch |  74 ------
  ...patch => 0005-rules-whitelist-hd-devices.patch} |   9 +-
  ...6-Make-root-s-home-directory-configurable.patch |  78 ++++++
  ...vert-rules-remove-firmware-loading-rules.patch} |   8 +-
  ...-check-for-missing-canonicalize_file_name.patch |  63 -----
  ...pper-instead-of-looking-for-relative-opti.patch |  40 ---
  .../systemd/0008-Do-not-enable-nss-tests.patch     |  35 ---
  ...remove-userspace-firmware-loading-suppor.patch} | 204 +++++++++-------
  ...=> 0009-remove-duplicate-include-uchar.h.patch} |  14 +-
  .../0010-check-for-uchar.h-in-meson.build.patch    |  45 ++++
  ...nes-Build-conditionally-when-HAVE_MYHOSTN.patch |  38 ---
  ...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} |  26 +-
  ...es-watch-metadata-changes-in-ide-devices.patch} |   8 +-
  ...3-Make-root-s-home-directory-configurable.patch | 155 ------------
  ...lback-parse_printf_format-implementation.patch} |  86 ++++---
  ...sic-missing.h-check-for-missing-strndupa.patch} |  96 ++++----
  ...f-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} |  30 +--
  ...ssing.h-check-for-missing-__compar_fn_t-.patch} |  18 +-
  ...patch => 0017-Include-netinet-if_ether.h.patch} |  55 +++--
  ...-check-for-missing-canonicalize_file_name.patch |  47 ++++
  .../0018-check-for-uchar.h-in-configure.patch      |  44 ----
  ...le-nss-tests-if-nss-systemd-is-not-enable.patch |  29 +++
  ...xdecoct.c-Include-missing.h-for-strndupa.patch} |  15 +-
  ...c-Disable-tests-for-missing-typedefs-in-.patch} |  39 ++-
  ...=> 0022-don-t-use-glibc-specific-qsort_r.patch} |  26 +-
  ...ss-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} |  22 +-
  ...n_t-is-glibc-specific-use-raw-signature-.patch} |  14 +-
  ...ATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} |  16 +-
  ...> 0026-Use-uintmax_t-for-handling-rlim_t.patch} |  22 +-
  .../0027-remove-nobody-user-group-checking.patch   |  63 +++++
  .../0028-add-missing-FTW_-macros-for-musl.patch    |  50 ++++
  ...nes-Build-conditionally-when-ENABLE_MYHOS.patch |  43 ++++
  ...-of-__register_atfork-for-non-glibc-build.patch |  45 ++++
  ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch |  30 +++
  meta/recipes-core/systemd/systemd/run-ptest        |   6 -
  .../systemd/{systemd_234.bb => systemd_237.bb}     | 270 +++++++++------------
  51 files changed, 1220 insertions(+), 1307 deletions(-)

rename meta/recipes-core/systemd/{systemd-boot_234.bb => systemd-boot_237.bb} (41%)
create mode 100644 meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
create mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
create mode 100644 meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
rename meta/recipes-core/systemd/systemd/{0004-Use-getenv-when-secure-versions-are-not-available.patch => 0001-Use-getenv-when-secure-versions-are-not-available.patch} (53%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-main-skip-many-initialization-steps-when-running-in-.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch
create mode 100644 meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch
create mode 100644 meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
rename meta/recipes-core/systemd/systemd/{0010-implment-systemd-sysv-install-for-OE.patch => 0004-implment-systemd-sysv-install-for-OE.patch} (89%) delete mode 100644 meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
rename meta/recipes-core/systemd/systemd/{0012-rules-whitelist-hd-devices.patch => 0005-rules-whitelist-hd-devices.patch} (89%)
create mode 100644 meta/recipes-core/systemd/systemd/0006-Make-root-s-home-directory-configurable.patch
rename meta/recipes-core/systemd/systemd/{0014-Revert-rules-remove-firmware-loading-rules.patch => 0007-Revert-rules-remove-firmware-loading-rules.patch} (81%) delete mode 100644 meta/recipes-core/systemd/systemd/0007-check-for-missing-canonicalize_file_name.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0008-Do-not-enable-nss-tests.patch
rename meta/recipes-core/systemd/systemd/{0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch => 0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch} (63%) rename meta/recipes-core/systemd/systemd/{0017-remove-duplicate-include-uchar.h.patch => 0009-remove-duplicate-include-uchar.h.patch} (78%)
create mode 100644 meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
rename meta/recipes-core/systemd/systemd/{0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch => 0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch} (58%) rename meta/recipes-core/systemd/systemd/{0020-rules-watch-metadata-changes-in-ide-devices.patch => 0012-rules-watch-metadata-changes-in-ide-devices.patch} (90%) delete mode 100644 meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
rename meta/recipes-core/systemd/systemd/{0001-add-fallback-parse_printf_format-implementation.patch => 0013-add-fallback-parse_printf_format-implementation.patch} (88%) rename meta/recipes-core/systemd/systemd/{0002-src-basic-missing.h-check-for-missing-strndupa.patch => 0014-src-basic-missing.h-check-for-missing-strndupa.patch} (47%) rename meta/recipes-core/systemd/systemd/{0003-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} (88%) rename meta/recipes-core/systemd/systemd/{0004-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch => 0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch} (77%) rename meta/recipes-core/systemd/systemd/{0006-Include-netinet-if_ether.h.patch => 0017-Include-netinet-if_ether.h.patch} (67%)
create mode 100644 meta/recipes-core/systemd/systemd/0018-check-for-missing-canonicalize_file_name.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0018-check-for-uchar.h-in-configure.patch
create mode 100644 meta/recipes-core/systemd/systemd/0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
rename meta/recipes-core/systemd/systemd/{0009-test-hexdecoct.c-Include-missing.h-form-strndupa.patch => 0020-test-hexdecoct.c-Include-missing.h-for-strndupa.patch} (68%) rename meta/recipes-core/systemd/systemd/{0010-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch => 0021-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch} (49%) rename meta/recipes-core/systemd/systemd/{0011-don-t-use-glibc-specific-qsort_r.patch => 0022-don-t-use-glibc-specific-qsort_r.patch} (88%)
rename meta/recipes-core/systemd/systemd/{0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch => 0023-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} (90%) rename meta/recipes-core/systemd/systemd/{0013-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch => 0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch} (77%) rename meta/recipes-core/systemd/systemd/{0001-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch => 0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} (80%) rename meta/recipes-core/systemd/systemd/{0001-Use-uintmax_t-for-handling-rlim_t.patch => 0026-Use-uintmax_t-for-handling-rlim_t.patch} (89%)
create mode 100644 meta/recipes-core/systemd/systemd/0027-remove-nobody-user-group-checking.patch
create mode 100644 meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch
create mode 100644 meta/recipes-core/systemd/systemd/0029-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
create mode 100644 meta/recipes-core/systemd/systemd/0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch
create mode 100644 meta/recipes-core/systemd/systemd/0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
delete mode 100644 meta/recipes-core/systemd/systemd/run-ptest
rename meta/recipes-core/systemd/{systemd_234.bb => systemd_237.bb} (71%)

--
1.9.1

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

author
#9 lore raw
In reply to Chen Qi

Hi Ross,

I've rebased the following patch against latest master and updated remote branch.

systemd-boot: upgrade to 237

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

Best Regards,
Chen Qi

Quoted 125 lines · Chen Qi

Changes from last patchset (236 upgrading):
1. Use more vars (AR, NM, etc.) than just CC and LD in meson.bbclass.
2. Keep the PACKAGECONFIG item's name 'manpages' for compatibility.
3. Make it check for all i*86 archs instead of just i586 for systemd-boot.
4. Fix the '==' bashism in systemd-boot.
5. Rebase patches for 237.

The following changes since commit bd5424f5b05a0a65471a77632efe7b9907370217:

   maintainers.inc: add myself as maintainer for the new busybox-inittab (2018-03-04 21:23:03 +0000)

are available in the git repository at:

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

Chen Qi (4):
meson.bbclass: fix to build for more projects
systemd: upgrade to 237
systemd: fix build failure for qemux86 and qemuppc with musl
systemd-boot: upgrade to 237

  meta/classes/meson.bbclass                         |  20 +-
  .../{systemd-boot_234.bb => systemd-boot_237.bb}   |  32 ++-
  meta/recipes-core/systemd/systemd.inc              |   2 +-
  ...01-Also-check-i386-i586-and-i686-for-ia32.patch |  28 +++
  ...efi_cc-and-efi_ld-correctly-when-cross-co.patch |  62 +++++
  ...ck-protector-flags-to-workaround-musl-bui.patch |  33 +++
  ...v-when-secure-versions-are-not-available.patch} |  21 +-
  ...te-presets-after-generators-have-run-6526.patch |  69 ------
  ...any-initialization-steps-when-running-in-.patch | 163 -------------
  ...update-header-file-to-detect-memfd_create.patch |  28 ---
  ...t-install-dependency-links-at-install-tim.patch |  81 +++++++
  ...c-Check-if-memfd_create-is-already-define.patch |  27 ---
  .../systemd/0003-fileio-include-sys-mman.h.patch   |  26 --
  ...pper-instead-of-looking-for-relative-opti.patch |  64 +++++
  ...004-implment-systemd-sysv-install-for-OE.patch} |   8 +-
  ...t-install-dependency-links-at-install-tim.patch |  74 ------
  ...patch => 0005-rules-whitelist-hd-devices.patch} |   9 +-
  ...6-Make-root-s-home-directory-configurable.patch |  78 ++++++
  ...vert-rules-remove-firmware-loading-rules.patch} |   8 +-
  ...-check-for-missing-canonicalize_file_name.patch |  63 -----
  ...pper-instead-of-looking-for-relative-opti.patch |  40 ---
  .../systemd/0008-Do-not-enable-nss-tests.patch     |  35 ---
  ...remove-userspace-firmware-loading-suppor.patch} | 204 +++++++++-------
  ...=> 0009-remove-duplicate-include-uchar.h.patch} |  14 +-
  .../0010-check-for-uchar.h-in-meson.build.patch    |  45 ++++
  ...nes-Build-conditionally-when-HAVE_MYHOSTN.patch |  38 ---
  ...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} |  26 +-
  ...es-watch-metadata-changes-in-ide-devices.patch} |   8 +-
  ...3-Make-root-s-home-directory-configurable.patch | 155 ------------
  ...lback-parse_printf_format-implementation.patch} |  86 ++++---
  ...sic-missing.h-check-for-missing-strndupa.patch} |  96 ++++----
  ...f-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} |  30 +--
  ...ssing.h-check-for-missing-__compar_fn_t-.patch} |  18 +-
  ...patch => 0017-Include-netinet-if_ether.h.patch} |  55 +++--
  ...-check-for-missing-canonicalize_file_name.patch |  47 ++++
  .../0018-check-for-uchar.h-in-configure.patch      |  44 ----
  ...le-nss-tests-if-nss-systemd-is-not-enable.patch |  29 +++
  ...xdecoct.c-Include-missing.h-for-strndupa.patch} |  15 +-
  ...c-Disable-tests-for-missing-typedefs-in-.patch} |  39 ++-
  ...=> 0022-don-t-use-glibc-specific-qsort_r.patch} |  26 +-
  ...ss-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} |  22 +-
  ...n_t-is-glibc-specific-use-raw-signature-.patch} |  14 +-
  ...ATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} |  16 +-
  ...> 0026-Use-uintmax_t-for-handling-rlim_t.patch} |  22 +-
  .../0027-remove-nobody-user-group-checking.patch   |  63 +++++
  .../0028-add-missing-FTW_-macros-for-musl.patch    |  50 ++++
  ...nes-Build-conditionally-when-ENABLE_MYHOS.patch |  43 ++++
  ...-of-__register_atfork-for-non-glibc-build.patch |  45 ++++
  ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch |  30 +++
  meta/recipes-core/systemd/systemd/run-ptest        |   6 -
  .../systemd/{systemd_234.bb => systemd_237.bb}     | 270 +++++++++------------
  51 files changed, 1220 insertions(+), 1307 deletions(-)

rename meta/recipes-core/systemd/{systemd-boot_234.bb => systemd-boot_237.bb} (41%)
create mode 100644 meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
create mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
create mode 100644 meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
rename meta/recipes-core/systemd/systemd/{0004-Use-getenv-when-secure-versions-are-not-available.patch => 0001-Use-getenv-when-secure-versions-are-not-available.patch} (53%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-main-skip-many-initialization-steps-when-running-in-.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch
create mode 100644 meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch
create mode 100644 meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
rename meta/recipes-core/systemd/systemd/{0010-implment-systemd-sysv-install-for-OE.patch => 0004-implment-systemd-sysv-install-for-OE.patch} (89%) delete mode 100644 meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
rename meta/recipes-core/systemd/systemd/{0012-rules-whitelist-hd-devices.patch => 0005-rules-whitelist-hd-devices.patch} (89%)
create mode 100644 meta/recipes-core/systemd/systemd/0006-Make-root-s-home-directory-configurable.patch
rename meta/recipes-core/systemd/systemd/{0014-Revert-rules-remove-firmware-loading-rules.patch => 0007-Revert-rules-remove-firmware-loading-rules.patch} (81%) delete mode 100644 meta/recipes-core/systemd/systemd/0007-check-for-missing-canonicalize_file_name.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0008-Do-not-enable-nss-tests.patch
rename meta/recipes-core/systemd/systemd/{0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch => 0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch} (63%) rename meta/recipes-core/systemd/systemd/{0017-remove-duplicate-include-uchar.h.patch => 0009-remove-duplicate-include-uchar.h.patch} (78%)
create mode 100644 meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
rename meta/recipes-core/systemd/systemd/{0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch => 0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch} (58%) rename meta/recipes-core/systemd/systemd/{0020-rules-watch-metadata-changes-in-ide-devices.patch => 0012-rules-watch-metadata-changes-in-ide-devices.patch} (90%) delete mode 100644 meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
rename meta/recipes-core/systemd/systemd/{0001-add-fallback-parse_printf_format-implementation.patch => 0013-add-fallback-parse_printf_format-implementation.patch} (88%) rename meta/recipes-core/systemd/systemd/{0002-src-basic-missing.h-check-for-missing-strndupa.patch => 0014-src-basic-missing.h-check-for-missing-strndupa.patch} (47%) rename meta/recipes-core/systemd/systemd/{0003-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} (88%) rename meta/recipes-core/systemd/systemd/{0004-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch => 0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch} (77%) rename meta/recipes-core/systemd/systemd/{0006-Include-netinet-if_ether.h.patch => 0017-Include-netinet-if_ether.h.patch} (67%)
create mode 100644 meta/recipes-core/systemd/systemd/0018-check-for-missing-canonicalize_file_name.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0018-check-for-uchar.h-in-configure.patch
create mode 100644 meta/recipes-core/systemd/systemd/0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
rename meta/recipes-core/systemd/systemd/{0009-test-hexdecoct.c-Include-missing.h-form-strndupa.patch => 0020-test-hexdecoct.c-Include-missing.h-for-strndupa.patch} (68%) rename meta/recipes-core/systemd/systemd/{0010-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch => 0021-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch} (49%) rename meta/recipes-core/systemd/systemd/{0011-don-t-use-glibc-specific-qsort_r.patch => 0022-don-t-use-glibc-specific-qsort_r.patch} (88%)
rename meta/recipes-core/systemd/systemd/{0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch => 0023-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} (90%) rename meta/recipes-core/systemd/systemd/{0013-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch => 0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch} (77%) rename meta/recipes-core/systemd/systemd/{0001-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch => 0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} (80%) rename meta/recipes-core/systemd/systemd/{0001-Use-uintmax_t-for-handling-rlim_t.patch => 0026-Use-uintmax_t-for-handling-rlim_t.patch} (89%)
create mode 100644 meta/recipes-core/systemd/systemd/0027-remove-nobody-user-group-checking.patch
create mode 100644 meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch
create mode 100644 meta/recipes-core/systemd/systemd/0029-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
create mode 100644 meta/recipes-core/systemd/systemd/0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch
create mode 100644 meta/recipes-core/systemd/systemd/0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
delete mode 100644 meta/recipes-core/systemd/systemd/run-ptest
rename meta/recipes-core/systemd/{systemd_234.bb => systemd_237.bb} (71%)

#10 lore raw
Quoted 11 lines · ChenQi

Hi Ross,

I've rebased the following patch against latest master and updated remote branch.

systemd-boot: upgrade to 237

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

oh now 238 is out
https://github.com/systemd/systemd/releases/tag/v238

it seems we are ingesting systemd too slow :)

Quoted 211 lines

Best Regards,
Chen Qi

Quoted 190 lines · Chen Qi

Changes from last patchset (236 upgrading):
1. Use more vars (AR, NM, etc.) than just CC and LD in meson.bbclass.
2. Keep the PACKAGECONFIG item's name 'manpages' for compatibility.
3. Make it check for all i*86 archs instead of just i586 for systemd-boot.
4. Fix the '==' bashism in systemd-boot.
5. Rebase patches for 237.

The following changes since commit
bd5424f5b05a0a65471a77632efe7b9907370217:

maintainers.inc: add myself as maintainer for the new busybox-inittab
(2018-03-04 21:23:03 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/systemd-237

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

Chen Qi (4):
meson.bbclass: fix to build for more projects
systemd: upgrade to 237
systemd: fix build failure for qemux86 and qemuppc with musl
systemd-boot: upgrade to 237

  meta/classes/meson.bbclass                         |  20 +-
  .../{systemd-boot_234.bb => systemd-boot_237.bb}   |  32 ++-
  meta/recipes-core/systemd/systemd.inc              |   2 +-
  ...01-Also-check-i386-i586-and-i686-for-ia32.patch |  28 +++
  ...efi_cc-and-efi_ld-correctly-when-cross-co.patch |  62 +++++
  ...ck-protector-flags-to-workaround-musl-bui.patch |  33 +++
  ...v-when-secure-versions-are-not-available.patch} |  21 +-
  ...te-presets-after-generators-have-run-6526.patch |  69 ------
  ...any-initialization-steps-when-running-in-.patch | 163 -------------
  ...update-header-file-to-detect-memfd_create.patch |  28 ---
  ...t-install-dependency-links-at-install-tim.patch |  81 +++++++
  ...c-Check-if-memfd_create-is-already-define.patch |  27 ---
  .../systemd/0003-fileio-include-sys-mman.h.patch   |  26 --
  ...pper-instead-of-looking-for-relative-opti.patch |  64 +++++
  ...004-implment-systemd-sysv-install-for-OE.patch} |   8 +-
  ...t-install-dependency-links-at-install-tim.patch |  74 ------
  ...patch => 0005-rules-whitelist-hd-devices.patch} |   9 +-
  ...6-Make-root-s-home-directory-configurable.patch |  78 ++++++
  ...vert-rules-remove-firmware-loading-rules.patch} |   8 +-
  ...-check-for-missing-canonicalize_file_name.patch |  63 -----
  ...pper-instead-of-looking-for-relative-opti.patch |  40 ---
  .../systemd/0008-Do-not-enable-nss-tests.patch     |  35 ---
  ...remove-userspace-firmware-loading-suppor.patch} | 204
+++++++++-------
  ...=> 0009-remove-duplicate-include-uchar.h.patch} |  14 +-
  .../0010-check-for-uchar.h-in-meson.build.patch    |  45 ++++
  ...nes-Build-conditionally-when-HAVE_MYHOSTN.patch |  38 ---
  ...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} |  26 +-
  ...es-watch-metadata-changes-in-ide-devices.patch} |   8 +-
  ...3-Make-root-s-home-directory-configurable.patch | 155 ------------
  ...lback-parse_printf_format-implementation.patch} |  86 ++++---
  ...sic-missing.h-check-for-missing-strndupa.patch} |  96 ++++----
  ...f-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} |  30 +--
  ...ssing.h-check-for-missing-__compar_fn_t-.patch} |  18 +-
  ...patch => 0017-Include-netinet-if_ether.h.patch} |  55 +++--
  ...-check-for-missing-canonicalize_file_name.patch |  47 ++++
  .../0018-check-for-uchar.h-in-configure.patch      |  44 ----
  ...le-nss-tests-if-nss-systemd-is-not-enable.patch |  29 +++
  ...xdecoct.c-Include-missing.h-for-strndupa.patch} |  15 +-
  ...c-Disable-tests-for-missing-typedefs-in-.patch} |  39 ++-
  ...=> 0022-don-t-use-glibc-specific-qsort_r.patch} |  26 +-
  ...ss-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} |  22 +-
  ...n_t-is-glibc-specific-use-raw-signature-.patch} |  14 +-
  ...ATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} |  16 +-
  ...> 0026-Use-uintmax_t-for-handling-rlim_t.patch} |  22 +-
  .../0027-remove-nobody-user-group-checking.patch   |  63 +++++
  .../0028-add-missing-FTW_-macros-for-musl.patch    |  50 ++++
  ...nes-Build-conditionally-when-ENABLE_MYHOS.patch |  43 ++++
  ...-of-__register_atfork-for-non-glibc-build.patch |  45 ++++
  ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch |  30 +++
  meta/recipes-core/systemd/systemd/run-ptest        |   6 -
  .../systemd/{systemd_234.bb => systemd_237.bb}     | 270
+++++++++------------
  51 files changed, 1220 insertions(+), 1307 deletions(-)

rename meta/recipes-core/systemd/{systemd-boot_234.bb =>
systemd-boot_237.bb} (41%)
create mode 100644
meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
create mode 100644
meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
create mode 100644
meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
rename
meta/recipes-core/systemd/systemd/{0004-Use-getenv-when-secure-versions-are-not-available.patch => 0001-Use-getenv-when-secure-versions-are-not-available.patch} (53%)
delete mode 100644
meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0001-main-skip-many-initialization-steps-when-running-in-.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch
create mode 100644
meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch
create mode 100644
meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
rename
meta/recipes-core/systemd/systemd/{0010-implment-systemd-sysv-install-for-OE.patch => 0004-implment-systemd-sysv-install-for-OE.patch} (89%)
delete mode 100644
meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
rename
meta/recipes-core/systemd/systemd/{0012-rules-whitelist-hd-devices.patch => 0005-rules-whitelist-hd-devices.patch} (89%)
create mode 100644
meta/recipes-core/systemd/systemd/0006-Make-root-s-home-directory-configurable.patch
rename
meta/recipes-core/systemd/systemd/{0014-Revert-rules-remove-firmware-loading-rules.patch => 0007-Revert-rules-remove-firmware-loading-rules.patch} (81%)
delete mode 100644
meta/recipes-core/systemd/systemd/0007-check-for-missing-canonicalize_file_name.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0008-Do-not-enable-nss-tests.patch
rename
meta/recipes-core/systemd/systemd/{0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch => 0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch} (63%)
rename
meta/recipes-core/systemd/systemd/{0017-remove-duplicate-include-uchar.h.patch
=> 0009-remove-duplicate-include-uchar.h.patch} (78%)
create mode 100644
meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
rename
meta/recipes-core/systemd/systemd/{0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch => 0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch} (58%)
rename
meta/recipes-core/systemd/systemd/{0020-rules-watch-metadata-changes-in-ide-devices.patch => 0012-rules-watch-metadata-changes-in-ide-devices.patch} (90%)
delete mode 100644
meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
rename
meta/recipes-core/systemd/systemd/{0001-add-fallback-parse_printf_format-implementation.patch => 0013-add-fallback-parse_printf_format-implementation.patch} (88%)
rename
meta/recipes-core/systemd/systemd/{0002-src-basic-missing.h-check-for-missing-strndupa.patch => 0014-src-basic-missing.h-check-for-missing-strndupa.patch} (47%)
rename
meta/recipes-core/systemd/systemd/{0003-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} (88%)
rename
meta/recipes-core/systemd/systemd/{0004-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch => 0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch} (77%)
rename
meta/recipes-core/systemd/systemd/{0006-Include-netinet-if_ether.h.patch => 0017-Include-netinet-if_ether.h.patch} (67%)
create mode 100644
meta/recipes-core/systemd/systemd/0018-check-for-missing-canonicalize_file_name.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0018-check-for-uchar.h-in-configure.patch
create mode 100644
meta/recipes-core/systemd/systemd/0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
rename
meta/recipes-core/systemd/systemd/{0009-test-hexdecoct.c-Include-missing.h-form-strndupa.patch => 0020-test-hexdecoct.c-Include-missing.h-for-strndupa.patch} (68%)
rename
meta/recipes-core/systemd/systemd/{0010-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch => 0021-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch} (49%)
rename
meta/recipes-core/systemd/systemd/{0011-don-t-use-glibc-specific-qsort_r.patch
=> 0022-don-t-use-glibc-specific-qsort_r.patch} (88%)
rename
meta/recipes-core/systemd/systemd/{0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch => 0023-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} (90%)
rename
meta/recipes-core/systemd/systemd/{0013-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch => 0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch} (77%)
rename
meta/recipes-core/systemd/systemd/{0001-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch => 0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} (80%)
rename
meta/recipes-core/systemd/systemd/{0001-Use-uintmax_t-for-handling-rlim_t.patch
=> 0026-Use-uintmax_t-for-handling-rlim_t.patch} (89%)
create mode 100644
meta/recipes-core/systemd/systemd/0027-remove-nobody-user-group-checking.patch
create mode 100644
meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch
create mode 100644

Quoted 9 lines

meta/recipes-core/systemd/systemd/0029-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
create mode 100644
meta/recipes-core/systemd/systemd/0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch
create mode 100644
meta/recipes-core/systemd/systemd/0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
delete mode 100644 meta/recipes-core/systemd/systemd/run-ptest
rename meta/recipes-core/systemd/{systemd_234.bb => systemd_237.bb}
(71%)

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

author
#11 lore raw
Quoted 8 lines · Khem Raj
Quoted 7 lines · ChenQi

Hi Ross,

I've rebased the following patch against latest master and updated remote branch.

systemd-boot: upgrade to 237

Quoted 8 lines
Quoted 4 lines

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

oh now 238 is out
https://github.com/systemd/systemd/releases/tag/v238

it seems we are ingesting systemd too slow :)

Yeah ... I also noticed this ...

Let's first make this 237 update merge into master, because this update involves a lot of changes due to the switch from autotools to meson.

Then I'll do the update to 238. I think that would be relatively easy.

Best Regards,
Chen Qi

Quoted 208 lines
Quoted 208 lines

Best Regards,
Chen Qi

Quoted 189 lines · Chen Qi

Changes from last patchset (236 upgrading):
1. Use more vars (AR, NM, etc.) than just CC and LD in meson.bbclass.
2. Keep the PACKAGECONFIG item's name 'manpages' for compatibility.
3. Make it check for all i*86 archs instead of just i586 for systemd-boot.
4. Fix the '==' bashism in systemd-boot.
5. Rebase patches for 237.

The following changes since commit
bd5424f5b05a0a65471a77632efe7b9907370217:

maintainers.inc: add myself as maintainer for the new busybox-inittab
(2018-03-04 21:23:03 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/systemd-237

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

Chen Qi (4):
meson.bbclass: fix to build for more projects
systemd: upgrade to 237
systemd: fix build failure for qemux86 and qemuppc with musl
systemd-boot: upgrade to 237

   meta/classes/meson.bbclass                         |  20 +-
   .../{systemd-boot_234.bb => systemd-boot_237.bb}   |  32 ++-
   meta/recipes-core/systemd/systemd.inc              |   2 +-
   ...01-Also-check-i386-i586-and-i686-for-ia32.patch |  28 +++
   ...efi_cc-and-efi_ld-correctly-when-cross-co.patch |  62 +++++
   ...ck-protector-flags-to-workaround-musl-bui.patch |  33 +++
   ...v-when-secure-versions-are-not-available.patch} |  21 +-
   ...te-presets-after-generators-have-run-6526.patch |  69 ------
   ...any-initialization-steps-when-running-in-.patch | 163 -------------
   ...update-header-file-to-detect-memfd_create.patch |  28 ---
   ...t-install-dependency-links-at-install-tim.patch |  81 +++++++
   ...c-Check-if-memfd_create-is-already-define.patch |  27 ---
   .../systemd/0003-fileio-include-sys-mman.h.patch   |  26 --
   ...pper-instead-of-looking-for-relative-opti.patch |  64 +++++
   ...004-implment-systemd-sysv-install-for-OE.patch} |   8 +-
   ...t-install-dependency-links-at-install-tim.patch |  74 ------
   ...patch => 0005-rules-whitelist-hd-devices.patch} |   9 +-
   ...6-Make-root-s-home-directory-configurable.patch |  78 ++++++
   ...vert-rules-remove-firmware-loading-rules.patch} |   8 +-
   ...-check-for-missing-canonicalize_file_name.patch |  63 -----
   ...pper-instead-of-looking-for-relative-opti.patch |  40 ---
   .../systemd/0008-Do-not-enable-nss-tests.patch     |  35 ---
   ...remove-userspace-firmware-loading-suppor.patch} | 204
+++++++++-------
   ...=> 0009-remove-duplicate-include-uchar.h.patch} |  14 +-
   .../0010-check-for-uchar.h-in-meson.build.patch    |  45 ++++
   ...nes-Build-conditionally-when-HAVE_MYHOSTN.patch |  38 ---
   ...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} |  26 +-
   ...es-watch-metadata-changes-in-ide-devices.patch} |   8 +-
   ...3-Make-root-s-home-directory-configurable.patch | 155 ------------
   ...lback-parse_printf_format-implementation.patch} |  86 ++++---
   ...sic-missing.h-check-for-missing-strndupa.patch} |  96 ++++----
   ...f-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} |  30 +--
   ...ssing.h-check-for-missing-__compar_fn_t-.patch} |  18 +-
   ...patch => 0017-Include-netinet-if_ether.h.patch} |  55 +++--
   ...-check-for-missing-canonicalize_file_name.patch |  47 ++++
   .../0018-check-for-uchar.h-in-configure.patch      |  44 ----
   ...le-nss-tests-if-nss-systemd-is-not-enable.patch |  29 +++
   ...xdecoct.c-Include-missing.h-for-strndupa.patch} |  15 +-
   ...c-Disable-tests-for-missing-typedefs-in-.patch} |  39 ++-
   ...=> 0022-don-t-use-glibc-specific-qsort_r.patch} |  26 +-
   ...ss-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} |  22 +-
   ...n_t-is-glibc-specific-use-raw-signature-.patch} |  14 +-
   ...ATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} |  16 +-
   ...> 0026-Use-uintmax_t-for-handling-rlim_t.patch} |  22 +-
   .../0027-remove-nobody-user-group-checking.patch   |  63 +++++
   .../0028-add-missing-FTW_-macros-for-musl.patch    |  50 ++++
   ...nes-Build-conditionally-when-ENABLE_MYHOS.patch |  43 ++++
   ...-of-__register_atfork-for-non-glibc-build.patch |  45 ++++
   ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch |  30 +++
   meta/recipes-core/systemd/systemd/run-ptest        |   6 -
   .../systemd/{systemd_234.bb => systemd_237.bb}     | 270
+++++++++------------
   51 files changed, 1220 insertions(+), 1307 deletions(-)

rename meta/recipes-core/systemd/{systemd-boot_234.bb =>
systemd-boot_237.bb} (41%)
create mode 100644
meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
create mode 100644
meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
create mode 100644
meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
rename
meta/recipes-core/systemd/systemd/{0004-Use-getenv-when-secure-versions-are-not-available.patch => 0001-Use-getenv-when-secure-versions-are-not-available.patch} (53%)
delete mode 100644
meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0001-main-skip-many-initialization-steps-when-running-in-.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch
create mode 100644
meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch
create mode 100644
meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
rename
meta/recipes-core/systemd/systemd/{0010-implment-systemd-sysv-install-for-OE.patch => 0004-implment-systemd-sysv-install-for-OE.patch} (89%)
delete mode 100644
meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
rename
meta/recipes-core/systemd/systemd/{0012-rules-whitelist-hd-devices.patch => 0005-rules-whitelist-hd-devices.patch} (89%)
create mode 100644
meta/recipes-core/systemd/systemd/0006-Make-root-s-home-directory-configurable.patch
rename
meta/recipes-core/systemd/systemd/{0014-Revert-rules-remove-firmware-loading-rules.patch => 0007-Revert-rules-remove-firmware-loading-rules.patch} (81%)
delete mode 100644
meta/recipes-core/systemd/systemd/0007-check-for-missing-canonicalize_file_name.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0008-Do-not-enable-nss-tests.patch
rename
meta/recipes-core/systemd/systemd/{0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch => 0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch} (63%)
rename
meta/recipes-core/systemd/systemd/{0017-remove-duplicate-include-uchar.h.patch
=> 0009-remove-duplicate-include-uchar.h.patch} (78%)
create mode 100644
meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
rename
meta/recipes-core/systemd/systemd/{0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch => 0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch} (58%)
rename
meta/recipes-core/systemd/systemd/{0020-rules-watch-metadata-changes-in-ide-devices.patch => 0012-rules-watch-metadata-changes-in-ide-devices.patch} (90%)
delete mode 100644
meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
rename
meta/recipes-core/systemd/systemd/{0001-add-fallback-parse_printf_format-implementation.patch => 0013-add-fallback-parse_printf_format-implementation.patch} (88%)
rename
meta/recipes-core/systemd/systemd/{0002-src-basic-missing.h-check-for-missing-strndupa.patch => 0014-src-basic-missing.h-check-for-missing-strndupa.patch} (47%)
rename
meta/recipes-core/systemd/systemd/{0003-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} (88%)
rename
meta/recipes-core/systemd/systemd/{0004-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch => 0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch} (77%)
rename
meta/recipes-core/systemd/systemd/{0006-Include-netinet-if_ether.h.patch => 0017-Include-netinet-if_ether.h.patch} (67%)
create mode 100644
meta/recipes-core/systemd/systemd/0018-check-for-missing-canonicalize_file_name.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0018-check-for-uchar.h-in-configure.patch
create mode 100644
meta/recipes-core/systemd/systemd/0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
rename
meta/recipes-core/systemd/systemd/{0009-test-hexdecoct.c-Include-missing.h-form-strndupa.patch => 0020-test-hexdecoct.c-Include-missing.h-for-strndupa.patch} (68%)
rename
meta/recipes-core/systemd/systemd/{0010-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch => 0021-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch} (49%)
rename
meta/recipes-core/systemd/systemd/{0011-don-t-use-glibc-specific-qsort_r.patch
=> 0022-don-t-use-glibc-specific-qsort_r.patch} (88%)
rename
meta/recipes-core/systemd/systemd/{0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch => 0023-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} (90%)
rename
meta/recipes-core/systemd/systemd/{0013-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch => 0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch} (77%)
rename
meta/recipes-core/systemd/systemd/{0001-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch => 0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch} (80%)
rename
meta/recipes-core/systemd/systemd/{0001-Use-uintmax_t-for-handling-rlim_t.patch
=> 0026-Use-uintmax_t-for-handling-rlim_t.patch} (89%)
create mode 100644
meta/recipes-core/systemd/systemd/0027-remove-nobody-user-group-checking.patch
create mode 100644
meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch
create mode 100644

Quoted 9 lines

meta/recipes-core/systemd/systemd/0029-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
create mode 100644
meta/recipes-core/systemd/systemd/0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch
create mode 100644
meta/recipes-core/systemd/systemd/0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
delete mode 100644 meta/recipes-core/systemd/systemd/run-ptest
rename meta/recipes-core/systemd/{systemd_234.bb => systemd_237.bb}
(71%)

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