diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-05-28 17:06:00 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-30 12:32:48 +0100 |
commit | 78c0324e21f20d0f50827a885945ddcd512a8920 (patch) | |
tree | d92337bbea461294a10107e56fee64c8881d25c5 /meta/recipes-core/util-linux/util-linux/0001-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch | |
parent | 7e7f0478079b7374afda0043943cfe5f98f9f3dc (diff) | |
download | poky-78c0324e21f20d0f50827a885945ddcd512a8920.tar.gz |
util-linux: upgrade 2.35.1 -> 2.35.2
0001-hwclock-fix-for-glibc-2.31-settimeofday.patch
0001-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch
0001-libfdisk-script-accept-sector-size-ignore-unknown-he.patch
are removed since they are included in 2.35.2
(From OE-Core rev: 3165c26b38f60f48c83cae266085363fe1aaa283)
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux/0001-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/0001-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/0001-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch b/meta/recipes-core/util-linux/util-linux/0001-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch deleted file mode 100644 index e43e12873f..0000000000 --- a/meta/recipes-core/util-linux/util-linux/0001-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 3cfde0370d3a8949df0c5bcf447cec6692910ed2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sami Kerola <kerolasa@iki.fi> | ||
3 | Date: Sat, 15 Feb 2020 21:12:50 +0000 | ||
4 | Subject: [PATCH] kill: include sys/types.h before checking | ||
5 | SYS_pidfd_send_signal | ||
6 | |||
7 | Including sys/types.h must happen before SYS_pidfd_send_signal is checked, | ||
8 | because that header defines variable in normal conditions. When sys/types.h | ||
9 | does not have SYS_pidfd_send_signal then fallback is defined in config.h | ||
10 | that is included by default, and has therefore worked fine before and after | ||
11 | this change. | ||
12 | |||
13 | Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/3cfde0370d3a8949df0c5bcf447cec6692910ed2] | ||
14 | |||
15 | Signed-off-by: Sami Kerola <kerolasa@iki.fi> | ||
16 | Signed-off-by: Benjamin Fair <benjaminfair@google.com> | ||
17 | --- | ||
18 | include/pidfd-utils.h | 18 ++++++++++-------- | ||
19 | 1 file changed, 10 insertions(+), 8 deletions(-) | ||
20 | |||
21 | diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h | ||
22 | index 593346576..0baedd2c9 100644 | ||
23 | --- a/include/pidfd-utils.h | ||
24 | +++ b/include/pidfd-utils.h | ||
25 | @@ -1,26 +1,28 @@ | ||
26 | #ifndef UTIL_LINUX_PIDFD_UTILS | ||
27 | #define UTIL_LINUX_PIDFD_UTILS | ||
28 | |||
29 | -#if defined(__linux__) && defined(SYS_pidfd_send_signal) | ||
30 | -# include <sys/types.h> | ||
31 | +#if defined(__linux__) | ||
32 | # include <sys/syscall.h> | ||
33 | +# if defined(SYS_pidfd_send_signal) | ||
34 | +# include <sys/types.h> | ||
35 | |||
36 | -# ifndef HAVE_PIDFD_OPEN | ||
37 | +# ifndef HAVE_PIDFD_OPEN | ||
38 | static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, | ||
39 | unsigned int flags) | ||
40 | { | ||
41 | return syscall(SYS_pidfd_send_signal, pidfd, sig, info, flags); | ||
42 | } | ||
43 | -# endif | ||
44 | +# endif | ||
45 | |||
46 | -# ifndef HAVE_PIDFD_SEND_SIGNAL | ||
47 | +# ifndef HAVE_PIDFD_SEND_SIGNAL | ||
48 | static inline int pidfd_open(pid_t pid, unsigned int flags) | ||
49 | { | ||
50 | return syscall(SYS_pidfd_open, pid, flags); | ||
51 | } | ||
52 | -# endif | ||
53 | +# endif | ||
54 | |||
55 | -# define UL_HAVE_PIDFD 1 | ||
56 | +# define UL_HAVE_PIDFD 1 | ||
57 | |||
58 | -#endif /* __linux__ && SYS_pidfd_send_signal */ | ||
59 | +# endif /* SYS_pidfd_send_signal */ | ||
60 | +#endif /* __linux__ */ | ||
61 | #endif /* UTIL_LINUX_PIDFD_UTILS */ | ||
62 | -- | ||
63 | 2.26.1.301.g55bc3eb7cb9-goog | ||
64 | |||