Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/
Date: Wed, 01 Dec 2021 20:34:37
Message-Id: 1638390864.106d32bbb4359104c8b08e5a8f6c55f5830650f1.sam@gentoo
1 commit: 106d32bbb4359104c8b08e5a8f6c55f5830650f1
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 1 20:33:15 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 1 20:34:24 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106d32bb
7
8 sys-process/criu: really add extra protobuf-c hunk
9
10 Doh!
11
12 Bug: https://bugs.gentoo.org/814056
13 Closes: https://bugs.gentoo.org/822006
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 .../{criu-3.15-r2.ebuild => criu-3.15-r3.ebuild} | 0
17 .../criu/files/criu-3.15-protobuf-c-1.4.0.patch | 24 ++++++++++++++++++++++
18 2 files changed, 24 insertions(+)
19
20 diff --git a/sys-process/criu/criu-3.15-r2.ebuild b/sys-process/criu/criu-3.15-r3.ebuild
21 similarity index 100%
22 rename from sys-process/criu/criu-3.15-r2.ebuild
23 rename to sys-process/criu/criu-3.15-r3.ebuild
24
25 diff --git a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
26 index 5e57fa084975..86d9cd31724d 100644
27 --- a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
28 +++ b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
29 @@ -168,3 +168,27 @@ index 3d64939584..d2bfbf958c 100644
30 void criu_set_notify_cb(int (*cb)(char *action, criu_notify_arg_t na));
31
32 /* Get pid of root task. 0 if not available */
33 +From: Radostin Stoyanov <radostin@××××××.com>
34 +Date: Fri, 3 Sep 2021 14:14:41 +0100
35 +Subject: [PATCH] lib: install images/rpc.pb-c.h
36 +
37 +Since commit 1c25914 compiling crun with libcriu also requires
38 +/usr/include/criu/rpc.pb-c.h
39 +
40 +Signed-off-by: Radostin Stoyanov <radostin@××××××.com>
41 +---
42 + lib/Makefile | 2 +-
43 + 1 file changed, 1 insertion(+), 1 deletion(-)
44 +
45 +diff --git a/lib/Makefile b/lib/Makefile
46 +index f9b66701e0..575a7bad3f 100644
47 +--- a/lib/Makefile
48 ++++ b/lib/Makefile
49 +@@ -1,6 +1,6 @@
50 + CRIU_SO := libcriu.so
51 + CRIU_A := libcriu.a
52 +-UAPI_HEADERS := lib/c/criu.h images/rpc.proto criu/include/version.h
53 ++UAPI_HEADERS := lib/c/criu.h images/rpc.proto images/rpc.pb-c.h criu/include/version.h
54 +
55 + #
56 + # File to keep track of files installed by setup.py