From 32eebb26027b0cd60f91aa6e35e08c7a0057595c Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mar 14 2018 06:53:52 +0000 Subject: Update to 3.8 --- diff --git a/.gitignore b/.gitignore index b043eff..9fcf366 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /criu-3.5.tar.bz2 /criu-3.6.tar.bz2 /criu-3.7.tar.bz2 +/criu-3.8.tar.bz2 diff --git a/0001-fix-building-on-newest-glibc-and-kernel.patch b/0001-fix-building-on-newest-glibc-and-kernel.patch deleted file mode 100644 index 4a4beb4..0000000 --- a/0001-fix-building-on-newest-glibc-and-kernel.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cb21b73e859de77804dde8579c6d1d1f84eec3a6 Mon Sep 17 00:00:00 2001 -From: Adrian Reber -Date: Thu, 28 Sep 2017 09:13:33 +0000 -Subject: [PATCH] fix building on newest glibc and kernel - -On Fedora rawhide with kernel-headers-4.14.0-0.rc2.git0.1.fc28.x86_64 -glibc-devel-2.26.90-15.fc28.x86_64 criu does not build any more: - -In file included from /usr/include/linux/aio_abi.h:31:0, - from criu/cr-check.c:24: -/usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant - MS_RDONLY = 1, /* Mount read-only. */ - ^ -make[2]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:111: criu/cr-check.o] Error 1 -make[1]: *** [criu/Makefile:73: criu/built-in.o] Error 2 -make: *** [Makefile:233: criu] Error 2 - -This simple re-ordering of includes fixes it for me. - -Signed-off-by: Adrian Reber ---- - criu/cr-check.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/criu/cr-check.c b/criu/cr-check.c -index 5dd448b..8986ec4 100644 ---- a/criu/cr-check.c -+++ b/criu/cr-check.c -@@ -21,8 +21,8 @@ - #include - #include - #include --#include - #include -+#include - - #include "../soccr/soccr.h" - --- -1.8.3.1 - diff --git a/36f3ab45867338e98e43ea5f1f26764ae3946fc2.patch b/36f3ab45867338e98e43ea5f1f26764ae3946fc2.patch deleted file mode 100644 index 0c7c579..0000000 --- a/36f3ab45867338e98e43ea5f1f26764ae3946fc2.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 36f3ab45867338e98e43ea5f1f26764ae3946fc2 Mon Sep 17 00:00:00 2001 -From: Andrei Vagin -Date: Tue, 17 Oct 2017 22:22:57 +0300 -Subject: [PATCH] fedora aarch64 - -Signed-off-by: Andrei Vagin ---- - .travis.yml | 2 ++ - compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h | 14 +++++++++++++- - scripts/build/Dockerfile.fedora-rawhide-aarch64.hdr | 3 +++ - scripts/build/Dockerfile.fedora-rawhide-aarch64.tmpl | 1 + - scripts/build/Makefile | 4 +--- - 5 files changed, 20 insertions(+), 4 deletions(-) - create mode 100644 scripts/build/Dockerfile.fedora-rawhide-aarch64.hdr - create mode 120000 scripts/build/Dockerfile.fedora-rawhide-aarch64.tmpl - -diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h -index 22246b8fa..ad6b218b9 100644 ---- a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h -+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h -@@ -41,10 +41,22 @@ struct rt_sigframe { - : "r"(new_sp) \ - : "sp", "x8", "memory") - -+struct cr_sigcontext { -+ __u64 fault_address; -+ /* AArch64 registers */ -+ __u64 regs[31]; -+ __u64 sp; -+ __u64 pc; -+ __u64 pstate; -+ /* 4K reserved for FP/SIMD state and future expansion */ -+ __u8 __reserved[4096] __attribute__((__aligned__(16))); -+}; -+ - #define RT_SIGFRAME_UC(rt_sigframe) (&rt_sigframe->uc) - #define RT_SIGFRAME_REGIP(rt_sigframe) ((long unsigned int)(rt_sigframe)->uc.uc_mcontext.pc) - #define RT_SIGFRAME_HAS_FPU(rt_sigframe) (1) --#define RT_SIGFRAME_AUX_CONTEXT(rt_sigframe) ((struct aux_context*)&(rt_sigframe)->uc.uc_mcontext.__reserved) -+#define RT_SIGFRAME_SIGCONTEXT(rt_sigframe) ((struct cr_sigcontext *)&(rt_sigframe)->uc.uc_mcontext) -+#define RT_SIGFRAME_AUX_CONTEXT(rt_sigframe) ((struct aux_context*)&(RT_SIGFRAME_SIGCONTEXT(rt_sigframe)->__reserved)) - #define RT_SIGFRAME_FPU(rt_sigframe) (&RT_SIGFRAME_AUX_CONTEXT(rt_sigframe)->fpsimd) - #define RT_SIGFRAME_OFFSET(rt_sigframe) 0 - diff --git a/criu.spec b/criu.spec index 2152610..ff26ff1 100644 --- a/criu.spec +++ b/criu.spec @@ -5,8 +5,8 @@ %endif Name: criu -Version: 3.7 -Release: 5%{?dist} +Version: 3.8 +Release: 1%{?dist} Provides: crtools = %{version}-%{release} Obsoletes: crtools <= 1.0-2 Summary: Tool for Checkpoint/Restore in User-space @@ -154,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name} %changelog +* Wed Mar 14 2018 Adrian Reber - 3.8-1 +- Update to 3.8 + * Wed Feb 07 2018 Fedora Release Engineering - 3.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 6dd9a64..4426b23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (criu-3.7.tar.bz2) = 8feb9e2579c04b67a7fe9631bb662504a7eb78550c3951cbe29252d87d9258fd6994533f6e60b0017b6a6e21bbdd5e7cd7e8a255be53b77b57efacec4e50140f +SHA512 (criu-3.8.tar.bz2) = d82d9d953e297284da79beccc9c4c48f528e91196e7ee4c573881dca4155a13bfa333e36f6a899c8bd66ae62262ff0178d2e1d363870fd3a19a36a4bbedebb1d