Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/
Date: Tue, 12 Dec 2017 17:08:17
Message-Id: 1513098356.08d720a1c7dfa5d87c02d6321245a3d3e502fbe2.tamiko@gentoo
1 commit: 08d720a1c7dfa5d87c02d6321245a3d3e502fbe2
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Nov 19 12:53:11 2017 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 12 17:05:56 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08d720a1
7
8 sys-process/criu: remove unused patch
9
10 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
11 Closes: https://github.com/gentoo/gentoo/pull/6235
12
13 sys-process/criu/files/criu-2.8-sysmacros.patch | 98 -------------------------
14 1 file changed, 98 deletions(-)
15
16 diff --git a/sys-process/criu/files/criu-2.8-sysmacros.patch b/sys-process/criu/files/criu-2.8-sysmacros.patch
17 deleted file mode 100644
18 index 68bba802f4e..00000000000
19 --- a/sys-process/criu/files/criu-2.8-sysmacros.patch
20 +++ /dev/null
21 @@ -1,98 +0,0 @@
22 -https://bugs.gentoo.org/580454
23 -https://github.com/xemul/criu/pull/257
24 -
25 -From 6913c0004eaa4fd11bf3efc8c37fb05108cf18ee Mon Sep 17 00:00:00 2001
26 -From: Yixun Lan <dlan@g.o>
27 -Date: Wed, 7 Dec 2016 00:24:42 -0500
28 -Subject: [PATCH] include sys/sysmacros.h for minor/major/makedev funcs
29 -
30 -Since glibc is moving away from implicitly including sys/sysmacros.h
31 -all the time via sys/types.h, include the header directly in more
32 -places. This seems to cover most makedev/major/minor usage.
33 -
34 -Signed-off-by: Yixun Lan <dlan@g.o>
35 -Signed-off-by: Mike Frysinger <vapier@g.o>
36 ----
37 - criu/file-lock.c | 1 +
38 - criu/include/util.h | 1 +
39 - criu/kerndat.c | 1 +
40 - criu/proc_parse.c | 1 +
41 - test/zdtm/lib/fs.h | 1 +
42 - test/zdtm/static/console.c | 1 +
43 - 6 files changed, 6 insertions(+)
44 -
45 -diff --git a/criu/file-lock.c b/criu/file-lock.c
46 -index 1ab1e5886965..11d8a194937a 100644
47 ---- a/criu/file-lock.c
48 -+++ b/criu/file-lock.c
49 -@@ -5,6 +5,7 @@
50 - #include <string.h>
51 - #include <sys/types.h>
52 - #include <sys/stat.h>
53 -+#include <sys/sysmacros.h>
54 -
55 - #include "cr_options.h"
56 - #include "imgset.h"
57 -diff --git a/criu/include/util.h b/criu/include/util.h
58 -index 8eaee33391c5..1aa40e863acb 100644
59 ---- a/criu/include/util.h
60 -+++ b/criu/include/util.h
61 -@@ -10,6 +10,7 @@
62 - #include <string.h>
63 - #include <sys/types.h>
64 - #include <sys/statfs.h>
65 -+#include <sys/sysmacros.h>
66 - #include <dirent.h>
67 -
68 - #include "int.h"
69 -diff --git a/criu/kerndat.c b/criu/kerndat.c
70 -index f9675bd7ec1d..aeef1b7f6640 100644
71 ---- a/criu/kerndat.c
72 -+++ b/criu/kerndat.c
73 -@@ -7,6 +7,7 @@
74 - #include <sys/mman.h>
75 - #include <errno.h>
76 - #include <sys/syscall.h>
77 -+#include <sys/sysmacros.h>
78 -
79 - #include "int.h"
80 - #include "log.h"
81 -diff --git a/criu/proc_parse.c b/criu/proc_parse.c
82 -index 3f84cdaad99a..a86d31769ded 100644
83 ---- a/criu/proc_parse.c
84 -+++ b/criu/proc_parse.c
85 -@@ -9,6 +9,7 @@
86 - #include <string.h>
87 - #include <ctype.h>
88 - #include <linux/fs.h>
89 -+#include <sys/sysmacros.h>
90 -
91 - #include "types.h"
92 - #include "common/list.h"
93 -diff --git a/test/zdtm/lib/fs.h b/test/zdtm/lib/fs.h
94 -index 972c49b4a068..972b15abad0c 100644
95 ---- a/test/zdtm/lib/fs.h
96 -+++ b/test/zdtm/lib/fs.h
97 -@@ -6,6 +6,7 @@
98 - #endif
99 -
100 - #include <sys/types.h>
101 -+#include <sys/sysmacros.h>
102 -
103 - #include <limits.h>
104 -
105 -diff --git a/test/zdtm/static/console.c b/test/zdtm/static/console.c
106 -index a86b14639729..41246aea0298 100644
107 ---- a/test/zdtm/static/console.c
108 -+++ b/test/zdtm/static/console.c
109 -@@ -8,6 +8,7 @@
110 -
111 - #include <sys/stat.h>
112 - #include <sys/types.h>
113 -+#include <sys/sysmacros.h>
114 -
115 - #include "zdtmtst.h"
116 -
117 ---
118 -2.11.0.rc2
119 -