From ada8a5d9175b141b4fe532f542f5c1f7ffa26d88 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 17 Jul 2018 10:05:11 +0800 Subject: systemd: upgrade to 239 Upgrade systemd to 239. 1. Patch Changes * Rebased Patches 0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch 0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch 0006-Make-root-s-home-directory-configurable.patch 0027-remove-nobody-user-group-checking.patch 0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch 0013-add-fallback-parse_printf_format-implementation.patch 0014-src-basic-missing.h-check-for-missing-strndupa.patch 0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch 0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch 0017-Include-netinet-if_ether.h.patch 0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch 0022-don-t-use-glibc-specific-qsort_r.patch 0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch 0026-Use-uintmax_t-for-handling-rlim_t.patch 0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch 0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch 0001-core-device.c-Change-the-default-device-timeout-to-2.patch 0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch * Dropped Patches and Reasons 0001-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch This patch is dropped because the problem has been fixed by binutils upstream. And this workaround could be dropped. https://sourceware.org/bugzilla/show_bug.cgi?id=18548 0007-Revert-rules-remove-firmware-loading-rules.patch 0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch These two patches are dropped because they are for kernel < 3.7. But the current minimal requirement of kernel to build systemd is as below. REQUIREMENTS: Linux kernel >= 3.13 Linux kernel >= 4.2 for unified cgroup hierarchy support So these two patches no long make any sense. Also remove non-exist firmware-path option 0009-remove-duplicate-include-uchar.h.patch 0010-check-for-uchar.h-in-meson.build.patch These two patches are dropped because musl has implemented uchar.h. See commit below from musl repo. """ ab9672ae73248f51e30f4553c4b8878525e46383 implement uchar.h (C11 UTF-16/32 conversion) interfaces """ 0018-check-for-missing-canonicalize_file_name.patch The above patch is dropped because current systemd does not need canonicalize_file_name. 0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch The above patch is dropped because utmp makes no sense in musl. Check code below from musl. include/utmp.h:#define _PATH_UTMP "/dev/null/utmp" And utmp PACKAGECONFIG has been explicitly disabled for musl. So we don't need this patch. 0032-memfd.patch 0033-basic-macros-rename-noreturn-into-_noreturn_-8456.patch libmount.patch 0034-Fix-format-truncation-compile-failure-by-typecasting.patch The above patches are dropped because they are backported patches. And current systemd has contained these patches. 0036-time-util-fix-build-with-gcc8-Werror-format-truncati.patch The above patch is dropped because it has been merged and is now in new version. * Newly Added Patch 0005-include-gshadow-only-if-ENABLE_GSHADOW-is-1.patch This patch is added to fix build for musl. 0019-Do-not-disable-buffering-when-writing-to-oom_score_a.patch This patch is added to fix the following error which caused system unable to boot up. systemd-udevd.service: Failed to adjust OOM setting: Invalid argument dbus.service: Failed to adjust OOM setting: Invalid argument 0020-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch This patch is added to fix segment fault error on musl systems. 0001-login-use-parse_uid-when-unmounting-user-runtime-dir.patch This patch is backported to solve a race condition between user-runtime-dir@xxx.service stop and user deletion. 2. PACKAGECONFIG and Dependency Changes * Add a new PACKAGECONFIG item 'gshadow'. Enable it by default for glibc but disable it by default for musl. This is because musl does not provide gshadow.h. * Add a new PACKAGECONFIG item 'portabled'. Default to disable it because it's still experimental, according to the announcement letter. """ Currently, the support is still experimental, but this is expected to change soon. Reflecting this experimental state, the "portablectl" binary is not installed into /usr/bin yet. """ * Change 'kmod' from a hard dependency to a PACKAGECONFIG item. Default to enable it. * Change 'acl' from a hard dependency to a PACKAGECONFIG item. Default to enable it. * Remove 'readline' from DEPENDS. systemd does not need it. * Remove 'libcgroup' from DEPENDS. The dependency on libcgroup has been removed from systemd a long time ago. We now remove this unnecessary dependency from DEPENDS. 3. update-alternatives changes The utilities like shutdown, poweroff, etc. are now created as symlinks at do_install. So there's no need to use update-alternatives mechanism anymore to create the symlinks now. In addtion, I don't think we now support multiple init systems at one running system, so there's really no need to use update-alternatives mechanism here. Also update the FILES_${PN} to include these files to avoid QA issue. (From OE-Core rev: 597f4645faf61486eb1d2ab73f3d974460ab9466) Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd/0032-memfd.patch | 272 --------------------- 1 file changed, 272 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0032-memfd.patch (limited to 'meta/recipes-core/systemd/systemd/0032-memfd.patch') diff --git a/meta/recipes-core/systemd/systemd/0032-memfd.patch b/meta/recipes-core/systemd/systemd/0032-memfd.patch deleted file mode 100644 index f7cfd60a3f..0000000000 --- a/meta/recipes-core/systemd/systemd/0032-memfd.patch +++ /dev/null @@ -1,272 +0,0 @@ -missing_syscall: when adding syscall replacements, use different names ( - -#8229) - -In meson.build we check that functions are available using: - meson.get_compiler('c').has_function('foo') -which checks the following: -- if __stub_foo or __stub___foo are defined, return false -- if foo is declared (a pointer to the function can be taken), return true -- otherwise check for __builtin_memfd_create - -_stub is documented by glibc as - It defines a symbol '__stub_FUNCTION' for each function - in the C library which is a stub, meaning it will fail - every time called, usually setting errno to ENOSYS. - -So if __stub is defined, we know we don't want to use the glibc version, but -this doesn't tell us if the name itself is defined or not. If it _is_ defined, -and we define our replacement as an inline static function, we get an error: - -In file included from ../src/basic/missing.h:1358:0, - from ../src/basic/util.h:47, - from ../src/basic/calendarspec.h:29, - from ../src/basic/calendarspec.c:34: -../src/basic/missing_syscall.h:65:19: error: static declaration of 'memfd_create' follows non-static declaration - static inline int memfd_create(const char *name, unsigned int flags) { - ^~~~~~~~~~~~ -.../usr/include/bits/mman-shared.h:46:5: note: previous declaration of 'memfd_create' was here - int memfd_create (const char *__name, unsigned int __flags) __THROW; - ^~~~~~~~~~~~ - -To avoid this problem, call our inline functions different than glibc, -and use a #define to map the official name to our replacement. - -Fixes #8099. - -v2: -- use "missing_" as the prefix instead of "_" - -v3: -- rebase and update for statx() - - Unfortunately "statx" is also present in "struct statx", so the define - causes issues. Work around this by using a typedef. - -I checked that systemd compiles with current glibc -(glibc-devel-2.26-24.fc27.x86_64) if HAVE_MEMFD_CREATE, HAVE_GETTID, -HAVE_PIVOT_ROOT, HAVE_SETNS, HAVE_RENAMEAT2, HAVE_KCMP, HAVE_KEYCTL, -HAVE_COPY_FILE_RANGE, HAVE_BPF, HAVE_STATX are forced to 0. - -Setting HAVE_NAME_TO_HANDLE_AT to 0 causes an issue, but it's not because of -the define, but because of struct file_handle. - - -backport https://github.com/systemd/systemd/commit/5187dd2c403caf92d09f3491e41f1ceb3f10491f - -Signed-off-by: Khem Raj -Upstream-Status: Backport [https://github.com/systemd/systemd/issues/8099] -Index: git/src/basic/missing_syscall.h -=================================================================== ---- git.orig/src/basic/missing_syscall.h -+++ git/src/basic/missing_syscall.h -@@ -26,9 +26,11 @@ - #include - - #if !HAVE_PIVOT_ROOT --static inline int pivot_root(const char *new_root, const char *put_old) { -+static inline int missing_pivot_root(const char *new_root, const char *put_old) { - return syscall(SYS_pivot_root, new_root, put_old); - } -+ -+# define pivot_root missing_pivot_root - #endif - - #if !HAVE_CANONICALIZE_FILE_NAME -@@ -68,7 +70,7 @@ static inline char *canonicalize_file_na - # endif - # endif - --static inline int memfd_create(const char *name, unsigned int flags) { -+static inline int missing_memfd_create(const char *name, unsigned int flags) { - # ifdef __NR_memfd_create - return syscall(__NR_memfd_create, name, flags); - # else -@@ -76,6 +78,8 @@ static inline int memfd_create(const cha - return -1; - # endif - } -+ -+# define memfd_create missing_memfd_create - #endif - - /* ======================================================================= */ -@@ -115,7 +119,7 @@ static inline int memfd_create(const cha - # endif - # endif - --static inline int getrandom(void *buffer, size_t count, unsigned flags) { -+static inline int missing_getrandom(void *buffer, size_t count, unsigned flags) { - # ifdef __NR_getrandom - return syscall(__NR_getrandom, buffer, count, flags); - # else -@@ -123,14 +127,18 @@ static inline int getrandom(void *buffer - return -1; - # endif - } -+ -+# define getrandom missing_getrandom - #endif - - /* ======================================================================= */ - - #if !HAVE_GETTID --static inline pid_t gettid(void) { -+static inline pid_t missing_gettid(void) { - return (pid_t) syscall(SYS_gettid); - } -+ -+# define gettid missing_gettid - #endif - - /* ======================================================================= */ -@@ -158,7 +166,7 @@ struct file_handle { - unsigned char f_handle[0]; - }; - --static inline int name_to_handle_at(int fd, const char *name, struct file_handle *handle, int *mnt_id, int flags) { -+static inline int missing_name_to_handle_at(int fd, const char *name, struct file_handle *handle, int *mnt_id, int flags) { - # ifdef __NR_name_to_handle_at - return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags); - # else -@@ -166,6 +174,8 @@ static inline int name_to_handle_at(int - return -1; - # endif - } -+ -+# define name_to_handle_at missing_name_to_handle_at - #endif - - /* ======================================================================= */ -@@ -183,7 +193,7 @@ static inline int name_to_handle_at(int - # endif - # endif - --static inline int setns(int fd, int nstype) { -+static inline int missing_setns(int fd, int nstype) { - # ifdef __NR_setns - return syscall(__NR_setns, fd, nstype); - # else -@@ -191,6 +201,8 @@ static inline int setns(int fd, int nsty - return -1; - # endif - } -+ -+# define setns missing_setns - #endif - - /* ======================================================================= */ -@@ -236,7 +248,7 @@ static inline pid_t raw_getpid(void) { - # endif - # endif - --static inline int renameat2(int oldfd, const char *oldname, int newfd, const char *newname, unsigned flags) { -+static inline int missing_renameat2(int oldfd, const char *oldname, int newfd, const char *newname, unsigned flags) { - # ifdef __NR_renameat2 - return syscall(__NR_renameat2, oldfd, oldname, newfd, newname, flags); - # else -@@ -244,12 +256,14 @@ static inline int renameat2(int oldfd, c - return -1; - # endif - } -+ -+# define renameat2 missing_renameat2 - #endif - - /* ======================================================================= */ - - #if !HAVE_KCMP --static inline int kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { -+static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { - # ifdef __NR_kcmp - return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2); - # else -@@ -257,36 +271,44 @@ static inline int kcmp(pid_t pid1, pid_t - return -1; - # endif - } -+ -+# define kcmp missing_kcmp - #endif - - /* ======================================================================= */ - - #if !HAVE_KEYCTL --static inline long keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4,unsigned long arg5) { -+static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4,unsigned long arg5) { - # ifdef __NR_keyctl - return syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5); - # else - errno = ENOSYS; - return -1; - # endif -+ -+# define keyctl missing_keyctl - } - --static inline key_serial_t add_key(const char *type, const char *description, const void *payload, size_t plen, key_serial_t ringid) { -+static inline key_serial_t missing_add_key(const char *type, const char *description, const void *payload, size_t plen, key_serial_t ringid) { - # ifdef __NR_add_key - return syscall(__NR_add_key, type, description, payload, plen, ringid); - # else - errno = ENOSYS; - return -1; - # endif -+ -+# define add_key missing_add_key - } - --static inline key_serial_t request_key(const char *type, const char *description, const char * callout_info, key_serial_t destringid) { -+static inline key_serial_t missing_request_key(const char *type, const char *description, const char * callout_info, key_serial_t destringid) { - # ifdef __NR_request_key - return syscall(__NR_request_key, type, description, callout_info, destringid); - # else - errno = ENOSYS; - return -1; - # endif -+ -+# define request_key missing_request_key - } - #endif - -@@ -313,10 +335,10 @@ static inline key_serial_t request_key(c - # endif - # endif - --static inline ssize_t copy_file_range(int fd_in, loff_t *off_in, -- int fd_out, loff_t *off_out, -- size_t len, -- unsigned int flags) { -+static inline ssize_t missing_copy_file_range(int fd_in, loff_t *off_in, -+ int fd_out, loff_t *off_out, -+ size_t len, -+ unsigned int flags) { - # ifdef __NR_copy_file_range - return syscall(__NR_copy_file_range, fd_in, off_in, fd_out, off_out, len, flags); - # else -@@ -324,6 +346,8 @@ static inline ssize_t copy_file_range(in - return -1; - # endif - } -+ -+# define copy_file_range missing_copy_file_range - #endif - - /* ======================================================================= */ -@@ -351,7 +375,7 @@ static inline ssize_t copy_file_range(in - - union bpf_attr; - --static inline int bpf(int cmd, union bpf_attr *attr, size_t size) { -+static inline int missing_bpf(int cmd, union bpf_attr *attr, size_t size) { - #ifdef __NR_bpf - return (int) syscall(__NR_bpf, cmd, attr, size); - #else -@@ -360,6 +384,7 @@ static inline int bpf(int cmd, union bpf - #endif - } - -+# define bpf missing_bpf - #endif - - /* ======================================================================= */ -- cgit v1.2.3-54-g00ecf