Contents of /trunk/systemd/patches/systemd-238-fix-util-linux-2.32-header-issues.patch
Parent Directory | Revision Log
Revision 3128 -
(show annotations)
(download)
Wed Jun 13 15:32:27 2018 UTC (6 years, 3 months ago) by niro
File size: 2379 byte(s)
Wed Jun 13 15:32:27 2018 UTC (6 years, 3 months ago) by niro
File size: 2379 byte(s)
-fixed util-linux-2.32 header issues
1 | # see: https://github.com/karelzak/systemd/commit/eb50b6d936c474f5bc2974c059f6432222af4de4 |
2 | |
3 | Fix linux/fs.h and sys/mount.h collisions |
4 | * (kernel-headers) linux/fs.h and (glibc) sys/mount.h contains MS_* constants |
5 | and because it's without #ifdefs you cannot include the both files together |
6 | in the same code |
7 | |
8 | * (systemd) src/basic/missing.h contains another copy of MS_* constants |
9 | |
10 | The patch removes local systemd MS_* fallbacks, cleanup fs.h and |
11 | mount.h include. |
12 | |
13 | Signed-off-by: Karel Zak <kzak@redhat.com> |
14 | |
15 | diff -Naur systemd-238/src/basic/missing.h systemd-238-util-linux-232/src/basic/missing.h |
16 | --- systemd-238/src/basic/missing.h 2018-03-05 23:16:37.000000000 +0100 |
17 | +++ systemd-238-util-linux-232/src/basic/missing.h 2018-06-13 17:28:21.192155047 +0200 |
18 | @@ -524,46 +524,6 @@ |
19 | #define OCFS2_SUPER_MAGIC 0x7461636f |
20 | #endif |
21 | |
22 | -#ifndef MS_MOVE |
23 | -#define MS_MOVE 8192 |
24 | -#endif |
25 | - |
26 | -#ifndef MS_REC |
27 | -#define MS_REC 16384 |
28 | -#endif |
29 | - |
30 | -#ifndef MS_PRIVATE |
31 | -#define MS_PRIVATE (1<<18) |
32 | -#endif |
33 | - |
34 | -#ifndef MS_REC |
35 | -#define MS_REC (1<<19) |
36 | -#endif |
37 | - |
38 | -#ifndef MS_SHARED |
39 | -#define MS_SHARED (1<<20) |
40 | -#endif |
41 | - |
42 | -#ifndef MS_RELATIME |
43 | -#define MS_RELATIME (1<<21) |
44 | -#endif |
45 | - |
46 | -#ifndef MS_KERNMOUNT |
47 | -#define MS_KERNMOUNT (1<<22) |
48 | -#endif |
49 | - |
50 | -#ifndef MS_I_VERSION |
51 | -#define MS_I_VERSION (1<<23) |
52 | -#endif |
53 | - |
54 | -#ifndef MS_STRICTATIME |
55 | -#define MS_STRICTATIME (1<<24) |
56 | -#endif |
57 | - |
58 | -#ifndef MS_LAZYTIME |
59 | -#define MS_LAZYTIME (1<<25) |
60 | -#endif |
61 | - |
62 | #ifndef SCM_SECURITY |
63 | #define SCM_SECURITY 0x03 |
64 | #endif |
65 | diff -Naur systemd-238/src/core/load-fragment.c systemd-238-util-linux-232/src/core/load-fragment.c |
66 | --- systemd-238/src/core/load-fragment.c 2018-03-05 23:16:37.000000000 +0100 |
67 | +++ systemd-238-util-linux-232/src/core/load-fragment.c 2018-06-13 17:29:04.915617706 +0200 |
68 | @@ -21,7 +21,6 @@ |
69 | |
70 | #include <errno.h> |
71 | #include <fcntl.h> |
72 | -#include <linux/fs.h> |
73 | #include <linux/oom.h> |
74 | #if HAVE_SECCOMP |
75 | #include <seccomp.h> |
76 | diff -Naur systemd-238/src/shared/bus-unit-util.c systemd-238-util-linux-232/src/shared/bus-unit-util.c |
77 | --- systemd-238/src/shared/bus-unit-util.c 2018-03-05 23:16:37.000000000 +0100 |
78 | +++ systemd-238-util-linux-232/src/shared/bus-unit-util.c 2018-06-13 17:29:55.999987322 +0200 |
79 | @@ -52,6 +52,8 @@ |
80 | #include "utf8.h" |
81 | #include "util.h" |
82 | |
83 | +#include <sys/mount.h> |
84 | + |
85 | int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { |
86 | assert(message); |
87 | assert(u); |