summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-12-01 20:33:15 +0000
committerSam James <sam@gentoo.org>2021-12-01 20:34:24 +0000
commit106d32bbb4359104c8b08e5a8f6c55f5830650f1 (patch)
tree522231255f88cdb3f7938bc7b7768bf0e580c05f
parentacct-user/root: set ACCT_USER_NO_MODIFY (diff)
downloadgentoo-106d32bbb4359104c8b08e5a8f6c55f5830650f1.tar.gz
gentoo-106d32bbb4359104c8b08e5a8f6c55f5830650f1.tar.bz2
gentoo-106d32bbb4359104c8b08e5a8f6c55f5830650f1.zip
sys-process/criu: really add extra protobuf-c hunk
Doh! Bug: https://bugs.gentoo.org/814056 Closes: https://bugs.gentoo.org/822006 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--sys-process/criu/criu-3.15-r3.ebuild (renamed from sys-process/criu/criu-3.15-r2.ebuild)0
-rw-r--r--sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch24
2 files changed, 24 insertions, 0 deletions
diff --git a/sys-process/criu/criu-3.15-r2.ebuild b/sys-process/criu/criu-3.15-r3.ebuild
index bb76d9a19d33..bb76d9a19d33 100644
--- a/sys-process/criu/criu-3.15-r2.ebuild
+++ b/sys-process/criu/criu-3.15-r3.ebuild
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
index 5e57fa084975..86d9cd31724d 100644
--- 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
@@ -168,3 +168,27 @@ index 3d64939584..d2bfbf958c 100644
void criu_set_notify_cb(int (*cb)(char *action, criu_notify_arg_t na));
/* Get pid of root task. 0 if not available */
+From: Radostin Stoyanov <radostin@redhat.com>
+Date: Fri, 3 Sep 2021 14:14:41 +0100
+Subject: [PATCH] lib: install images/rpc.pb-c.h
+
+Since commit 1c25914 compiling crun with libcriu also requires
+/usr/include/criu/rpc.pb-c.h
+
+Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
+---
+ lib/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index f9b66701e0..575a7bad3f 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -1,6 +1,6 @@
+ CRIU_SO := libcriu.so
+ CRIU_A := libcriu.a
+-UAPI_HEADERS := lib/c/criu.h images/rpc.proto criu/include/version.h
++UAPI_HEADERS := lib/c/criu.h images/rpc.proto images/rpc.pb-c.h criu/include/version.h
+
+ #
+ # File to keep track of files installed by setup.py