nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: criu: Update to 3.11. 

* gnu/packages/virtualization.scm (criu): Update to 3.11.
[arguments]: Add custom phase to patch python calls.
This commit is contained in:
Efraim Flashner 2019-01-08 12:29:24 +02:00
parent 49fe965d28
commit 580f33e119
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnu/packages/virtualization.scm
View File

@ -656,14 +656,14 @@ domains, their live performance and resource utilization statistics.")
(define-public criu (define-public criu
(package (package
(name "criu") (name "criu")
(version "3.7") (version "3.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.openvz.org/criu/criu-" (uri (string-append "http://download.openvz.org/criu/criu-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0qrpz7pvnks34v7d8lb73flz3mb7qwnib94pdwaxh0mskn8470fq")))) "03nimyn3wy5mlw30gq7bvlzvvprqjv8f25240yj5arzlld8mhsw8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -681,9 +681,6 @@ domains, their live performance and resource utilization statistics.")
(string-append (assoc-ref inputs "libnl") (string-append (assoc-ref inputs "libnl")
"/include/libnl3:" "/include/libnl3:"
(getenv "C_INCLUDE_PATH"))) (getenv "C_INCLUDE_PATH")))
;; Hardcode arm version detection
(substitute* "Makefile"
(("ARMV.*:=.*") "ARMV := 7\n"))
;; Prevent xmlto from failing the install phase. ;; Prevent xmlto from failing the install phase.
(substitute* "Documentation/Makefile" (substitute* "Documentation/Makefile"
(("XMLTO.*:=.*") (("XMLTO.*:=.*")
@ -695,7 +692,23 @@ domains, their live performance and resource utilization statistics.")
(assoc-ref inputs "docbook-xsl") (assoc-ref inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-" "/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl) ,(package-version docbook-xsl)
"/manpages/docbook.xsl"))) "/manpages/docbook.xsl"))
(("\\$\\(XMLTO\\);")
(string-append (assoc-ref inputs "xmlto")
"/bin/xmlto;")))
#t))
(add-after 'unpack 'hardcode-variables
(lambda* (#:key inputs #:allow-other-keys)
;; Hardcode arm version detection
(substitute* "Makefile"
(("ARMV.*:=.*") "ARMV := 7\n"))
;; We are currently using python-2
(substitute* "crit/Makefile"
(("\\$\\(PYTHON\\)") "python2"))
(substitute* "lib/Makefile"
(("\\$\\(PYTHON\\)")
(string-append (assoc-ref inputs "python")
"/bin/python")))
#t)) #t))
(add-before 'build 'fix-symlink (add-before 'build 'fix-symlink
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)