pyrox.dev
criu: 2.12.1 -> 3.7
cc @thoughtpolice
-13
pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch
-13
pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch
···
1
-
--- a/criu/cr-restore.c
2
-
+++ b/criu/cr-restore.c
3
-
@@ -650,3 +650,2 @@ static void zombie_prepare_signals(void)
4
-
(1 << SIGSYS) |\
5
-
- (1 << SIGUNUSED)|\
6
-
(1 << SIGSTKFLT)|\
7
-
--- a/test/zdtm/static/pthread01.c
8
-
+++ b/test/zdtm/static/pthread01.c
9
-
@@ -45,3 +45,3 @@ static char *decode_signal(const sigset_t *s, char *buf)
10
-
COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); COLLECT(SIGWINCH); COLLECT(SIGIO);
11
-
- COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED);
12
-
+ COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS);
13
-
#undef COLLECT
···
+2
-9
pkgs/os-specific/linux/criu/default.nix
+2
-9
pkgs/os-specific/linux/criu/default.nix
···
4
5
stdenv.mkDerivation rec {
6
name = "criu-${version}";
7
-
version = "2.12.1";
8
9
src = fetchurl {
10
url = "http://download.openvz.org/criu/${name}.tar.bz2";
11
-
sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k";
12
};
13
-
14
-
patches = [ ./criu-2.12.1-glibc-2.26.patch ];
15
16
enableParallelBuilding = true;
17
nativeBuildInputs = [ pkgconfig docbook_xsl ];
18
buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ];
19
20
postPatch = ''
21
-
chmod +w ./scripts/gen-offsets.sh
22
-
substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump
23
substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" ""
24
substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
25
substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3"
26
substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0"
27
ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
28
-
29
-
# Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
30
-
sed 1i'#include <sys/sysmacros.h>' -i criu/include/util.h
31
'';
32
33
buildPhase = "make PREFIX=$out";
···
4
5
stdenv.mkDerivation rec {
6
name = "criu-${version}";
7
+
version = "3.7";
8
9
src = fetchurl {
10
url = "http://download.openvz.org/criu/${name}.tar.bz2";
11
+
sha256 = "0qrpz7pvnks34v7d8lb73flz3mb7qwnib94pdwaxh0mskn8470fq";
12
};
13
14
enableParallelBuilding = true;
15
nativeBuildInputs = [ pkgconfig docbook_xsl ];
16
buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ];
17
18
postPatch = ''
19
substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" ""
20
substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
21
substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3"
22
substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0"
23
ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
24
'';
25
26
buildPhase = "make PREFIX=$out";