From 76816de668680d0e76e9878bafccd85c879c599c Mon Sep 17 00:00:00 2001 From: jwhl Date: Mon, 18 Nov 2024 08:57:23 +0000 Subject: [PATCH 1/2] fix rawhide netlink error Signed-off-by: jwhl --- 0003-ci-fix-rawhide-netlink-error.patch | 31 +++++++++++++++++++++++++ criu.spec | 6 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0003-ci-fix-rawhide-netlink-error.patch diff --git a/0003-ci-fix-rawhide-netlink-error.patch b/0003-ci-fix-rawhide-netlink-error.patch new file mode 100644 index 0000000..f3c50d1 --- /dev/null +++ b/0003-ci-fix-rawhide-netlink-error.patch @@ -0,0 +1,31 @@ +From fc94b2d158961611d39b7e692c019487da43e01b Mon Sep 17 00:00:00 2001 +From: Adrian Reber +Date: Wed, 29 Nov 2023 08:27:29 +0000 +Subject: [PATCH] ci: fix rawhide netlink error + +The rawhide netlink errors are fixed with a newer kernel than the +default 6.2 available in Fedora 38. + +Signed-off-by: Adrian Reber +--- + scripts/ci/vagrant.sh | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh +index 328903f38..c0c8e88c1 100755 +--- a/scripts/ci/vagrant.sh ++++ b/scripts/ci/vagrant.sh +@@ -57,6 +57,11 @@ fedora-no-vdso() { + } + + fedora-rawhide() { ++ # The 6.2 kernel of Fedora 38 in combination with rawhide userspace breaks ++ # zdtm/static/socket-tcp-nfconntrack. To activate the new kernel previously ++ # installed this reboots the VM. ++ vagrant reload ++ ssh default uname -a + # + # Workaround the problem: + # error running container: error from /usr/bin/crun creating container for [...]: sd-bus call: Transport endpoint is not connected +-- +2.43.0 \ No newline at end of file diff --git a/criu.spec b/criu.spec index c5b8066..279b542 100644 --- a/criu.spec +++ b/criu.spec @@ -1,6 +1,6 @@ Name: criu Version: 3.19 -Release: 1 +Release: 2 Provides: crtools = %{version}-%{release} Obsoletes: crtools <= 1.0-2 Summary: A tool of Checkpoint/Restore in User-space @@ -17,6 +17,7 @@ Provides: %{name}-libs = %{version}-%{release} Obsoletes: %{name}-libs < %{version}-%{release} Patch1: 0001-criu-dump-and-restore-cpu-affinity-of-each-thread.patch +Patch3: 0003-ci-fix-rawhide-netlink-error.patch %description Checkpoint/Restore in Userspace(CRIU),is a software tool for the linux operating system. @@ -102,6 +103,9 @@ chmod 0755 %{buildroot}/run/%{name}/ %doc %{_mandir}/man1/{compel.1*,crit.1*,criu-ns.1*,criu-amdgpu-plugin.1*} %changelog +* Mon Nov 18 2024 - 3.19-2 +- fix rawhide netlink error + * Thu Apr 25 2024 snoweay - 3.19-1 - update to version 3.19 from criu.org -- Gitee From 1182b51d094f59d68bda2c5938dd4d507e7e77df Mon Sep 17 00:00:00 2001 From: jwhl Date: Mon, 18 Nov 2024 12:24:42 +0000 Subject: [PATCH 2/2] update Signed-off-by: jwhl --- criu.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/criu.spec b/criu.spec index 279b542..3f24508 100644 --- a/criu.spec +++ b/criu.spec @@ -17,6 +17,7 @@ Provides: %{name}-libs = %{version}-%{release} Obsoletes: %{name}-libs < %{version}-%{release} Patch1: 0001-criu-dump-and-restore-cpu-affinity-of-each-thread.patch +Patch2: 0002-mm-add-pin-memory-method-for-criu.patch Patch3: 0003-ci-fix-rawhide-netlink-error.patch %description -- Gitee