diff options
author | Luca Boccassi <luca.boccassi@microsoft.com> | 2020-12-18 09:42:52 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-20 00:03:04 +0000 |
commit | 754d05fffebb69b6abcbe0cac39541aaee551f90 (patch) | |
tree | 1b74251f6b1edf0d1e77490112078b6a9349711d /meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch | |
parent | fae7b0ddba4836d7b1b1d642bd4514ceab50ca09 (diff) | |
download | poky-754d05fffebb69b6abcbe0cac39541aaee551f90.tar.gz |
systemd: update 246 -> 247
Update systemd to v247.2.
Add rule for new oomd dbus conf and for new pam.d
conf directory in /usr/lib|lib64.
Drop selinux-hook-handling-to-enumerate-nexthop.patch,
merged upstream.
Drop 0001-meson-Fix-reallocarray-check.patch,
merged upstream.
Refresh musl patches.
(From OE-Core rev: 1e1d26de68ed13fd53c1a16b9662ac9860dca714)
Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch deleted file mode 100644 index d394444c1c..0000000000 --- a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | From dbe8b3ee45580defeefcac929b897c5437ffc50b Mon Sep 17 00:00:00 2001 | ||
2 | From: Scott Murray <scott.murray@konsulko.com> | ||
3 | Date: Fri, 13 Sep 2019 19:26:27 -0400 | ||
4 | Subject: [PATCH] Handle __cpu_mask usage | ||
5 | |||
6 | Fixes errors: | ||
7 | |||
8 | src/test/test-cpu-set-util.c:18:54: error: '__cpu_mask' undeclared (first use in this function) | ||
9 | src/test/test-sizeof.c:73:14: error: '__cpu_mask' undeclared (first use in this function) | ||
10 | |||
11 | __cpu_mask is an internal type of glibc's cpu_set implementation, not | ||
12 | part of the POSIX definition, which is problematic when building with | ||
13 | musl, which does not define a matching type. From inspection of musl's | ||
14 | sched.h, however, it is clear that the corresponding type would be | ||
15 | unsigned long, which does match glibc's actual __CPU_MASK_TYPE. So, | ||
16 | add a typedef to cpu-set-util.h defining __cpu_mask appropriately. | ||
17 | |||
18 | Upstream-Status: Inappropriate [musl specific] | ||
19 | |||
20 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | ||
21 | |||
22 | --- | ||
23 | src/shared/cpu-set-util.h | 2 ++ | ||
24 | src/test/test-sizeof.c | 2 +- | ||
25 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
26 | |||
27 | diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h | ||
28 | index 27812dfd5923..0ab40731ea93 100644 | ||
29 | --- a/src/shared/cpu-set-util.h | ||
30 | +++ b/src/shared/cpu-set-util.h | ||
31 | @@ -6,6 +6,8 @@ | ||
32 | #include "macro.h" | ||
33 | #include "missing_syscall.h" | ||
34 | |||
35 | +typedef unsigned long __cpu_mask; | ||
36 | + | ||
37 | /* This wraps the libc interface with a variable to keep the allocated size. */ | ||
38 | typedef struct CPUSet { | ||
39 | cpu_set_t *set; | ||
40 | diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c | ||
41 | index c65062d2562c..8b6eefa9cdae 100644 | ||
42 | --- a/src/test/test-sizeof.c | ||
43 | +++ b/src/test/test-sizeof.c | ||
44 | @@ -1,6 +1,5 @@ | ||
45 | /* SPDX-License-Identifier: LGPL-2.1+ */ | ||
46 | |||
47 | -#include <sched.h> | ||
48 | #include <stdio.h> | ||
49 | #include <string.h> | ||
50 | #include <sys/types.h> | ||
51 | @@ -10,6 +9,7 @@ | ||
52 | #include <float.h> | ||
53 | |||
54 | #include "time-util.h" | ||
55 | +#include "cpu-set-util.h" | ||
56 | |||
57 | /* Print information about various types. Useful when diagnosing | ||
58 | * gcc diagnostics on an unfamiliar architecture. */ | ||