Accepting request 994456 from home:tiwai:branches:devel:tools

- Update to criu 3.17.1:
  * Fixes for pre-dump read mode
  * Fixes for mount-v2
  * amdgpu plugin build and installation fixes
  * Some minor CI related fixes

OBS-URL: https://build.opensuse.org/request/show/994456
OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=111

criu-3.17.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f90fe2323ed1b84f273dc41dde1a38dd424157a57f713d1ba39094e70f90eca6
+size 1323445

criu-3.17.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79744c938e33032951a41af45724be7ee9004445be8b4e4f3c59e0f7438168e7
-size 1321713

criu-amdgpu-plugin-fix.patch

@@ -1,12 +1,12 @@
 ---
- plugins/amdgpu/Makefile    |    9 +++++----
+ plugins/amdgpu/Makefile    |    3 ++-
  plugins/amdgpu/kfd_ioctl.h |    2 +-
- 2 files changed, 6 insertions(+), 5 deletions(-)
+ 2 files changed, 3 insertions(+), 2 deletions(-)
 
 --- a/plugins/amdgpu/Makefile
 +++ b/plugins/amdgpu/Makefile
 @@ -5,7 +5,8 @@ PLUGIN_SOBJ		:= amdgpu_plugin.so
- PLUGIN_INCLUDE  	:= -iquote../../../criu/include
+ PLUGIN_INCLUDE  	:= -iquote../../include
  PLUGIN_INCLUDE  	+= -iquote../../criu/include
  PLUGIN_INCLUDE  	+= -iquote../../criu/arch/$(ARCH)/include/
 -PLUGIN_INCLUDE  	+= -iquote../../
@@ -15,26 +15,6 @@
  
  COMPEL                 := ../../compel/compel-host
  LIBDRM_INC 		:= -I/usr/include/libdrm
-@@ -50,16 +51,16 @@ clean: amdgpu_plugin_clean amdgpu_plugin
- mrproper: clean
- 
- install:
--	$(Q) mkdir -p $(PLUGINDIR)
-+	$(Q) mkdir -p $(DESTDIR)$(PLUGINDIR)
- ifeq ($(CONFIG_AMDGPU),y)
- 	$(E) "  INSTALL " $(PLUGIN_NAME)
--	$(Q) install -m 644 $(PLUGIN_SOBJ) $(PLUGINDIR)
-+	$(Q) install -m 644 $(PLUGIN_SOBJ) $(DESTDIR)$(PLUGINDIR)
- endif
- .PHONY: install
- 
- uninstall:
- ifeq ($(CONFIG_AMDGPU),y)
- 	$(E) " UNINSTALL" $(PLUGIN_NAME)
--	$(Q) $(RM) $(PLUGINDIR)/$(PLUGIN_SOBJ)
-+	$(Q) $(RM) $(DESTDIR)$(PLUGINDIR)/$(PLUGIN_SOBJ)
- endif
- .PHONY: uninstall
 --- a/plugins/amdgpu/kfd_ioctl.h
 +++ b/plugins/amdgpu/kfd_ioctl.h
 @@ -23,7 +23,7 @@

criu.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Aug 11 07:06:26 UTC 2022 - Takashi Iwai <tiwai@suse.com>
+
+- Update to criu 3.17.1:
+  * Fixes for pre-dump read mode
+  * Fixes for mount-v2
+  * amdgpu plugin build and installation fixes
+  * Some minor CI related fixes
+
 -------------------------------------------------------------------
 Wed May 18 07:01:20 UTC 2022 - Takashi Iwai <tiwai@suse.com>
 

criu.spec

@@ -34,7 +34,7 @@
 %define proto_c_ver %(protoc-c --version | head -1 | awk '{print $2}')
 
 Name:           criu
-Version:        3.17
+Version:        3.17.1
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0-only

plugin-dir-path.patch

@@ -13,22 +13,22 @@
 +LIBDIR		?= $(PREFIX)/lib
  LIBEXECDIR	?= $(PREFIX)/libexec
  RUNDIR		?= /run
--PLUGINDIR	?= /var/lib/criu
+-PLUGINDIR	?= $(PREFIX)/lib/criu
 +PLUGINDIR	?= $(LIBDIR)/criu
  
  #
  # For recent Debian/Ubuntu with multiarch support.
 --- a/criu/include/plugin.h
 +++ b/criu/include/plugin.h
-@@ -5,7 +5,7 @@
- #include "common/compiler.h"
+@@ -6,7 +6,7 @@
  #include "common/list.h"
  
--#define CR_PLUGIN_DEFAULT "/var/lib/criu/"
+ #ifndef CR_PLUGIN_DEFAULT
+-#define CR_PLUGIN_DEFAULT "/usr/lib/criu/"
 +#define CR_PLUGIN_DEFAULT LIBDIR "/criu/"
+ #endif
  
  void cr_plugin_fini(int stage, int err);
- int cr_plugin_init(int stage);
 --- a/criu/Makefile
 +++ b/criu/Makefile
 @@ -29,6 +29,9 @@ CFLAGS			+= -iquote $(ARCH_DIR)/include