[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
22/24: gnu: criu: Update to 3.17.
From: |
guix-commits |
Subject: |
22/24: gnu: criu: Update to 3.17. |
Date: |
Tue, 24 May 2022 20:23:00 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit ee44a72409017f1bb74b1bc4c2e82fe03ac18c5c
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun May 22 02:00:01 2022 +0200
gnu: criu: Update to 3.17.
* gnu/packages/virtualization.scm (criu): Update to 3.17.
[arguments]: Set the correct and unused PLUGINDIR.
---
gnu/packages/virtualization.scm | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index f3396e7c94..750b08f651 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1547,7 +1547,7 @@ domains, their live performance and resource utilization
statistics.")
(define-public criu
(package
(name "criu")
- (version "3.16.1")
+ (version "3.17")
(source
(origin
(method git-fetch)
@@ -1556,15 +1556,17 @@ domains, their live performance and resource
utilization statistics.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1riw15197fnrs254jl7wks9x8bdml76kf1vnqkkgyypr13dnq55g"))))
+ (base32 "1qql1xp2zkkd7z50vp0nylx3rqrp8xa3c6x25c886d5i1j9pak5x"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
#:tests? #f ; tests require mounting as root
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
- (string-append "LIBDIR=" (assoc-ref %outputs "out")
- "/lib")
+ (string-append "LIBDIR=$(PREFIX)/lib")
+ ;; Upstream mistakenly puts binaries in /var. Now, in practice no
+ ;; plugins are built, but the build system still fails otherwise.
+ (string-append "PLUGINDIR=$(LIBDIR)/criu")
(string-append "ASCIIDOC="
(search-input-file %build-inputs
"/bin/asciidoc"))
@@ -1586,10 +1588,14 @@ domains, their live performance and resource
utilization statistics.")
,(package-version docbook-xsl)
"/manpages/docbook.xsl")))))
(add-after 'unpack 'hardcode-variables
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
;; Hardcode arm version detection
(substitute* "Makefile"
- (("ARMV.*:=.*") "ARMV := 7\n"))))
+ (("ARMV.*:=.*") "ARMV := 7\n"))
+ ;; Hard-code the correct PLUGINDIR above.
+ (substitute* "criu/include/plugin.h"
+ (("/var") (string-append (assoc-ref outputs "out"))))
+ ))
(add-before 'build 'fix-symlink
(lambda* (#:key inputs #:allow-other-keys)
;; The file 'images/google/protobuf/descriptor.proto' points to
- 10/24: gnu: libnfnetlink: Update to 1.0.2., (continued)
- 10/24: gnu: libnfnetlink: Update to 1.0.2., guix-commits, 2022/05/24
- 02/24: gnu: ytnef: Update to 2.0., guix-commits, 2022/05/24
- 08/24: gnu: jitterentropy-rngd: Update to 1.2.7., guix-commits, 2022/05/24
- 04/24: gnu: mbuffer: Update to 20220418., guix-commits, 2022/05/24
- 09/24: gnu: libinih: Update to 55., guix-commits, 2022/05/24
- 01/24: gnu: busybox: Update to 1.34.1., guix-commits, 2022/05/24
- 17/24: gnu: iotop: Update to 0.6-0.a14256a., guix-commits, 2022/05/24
- 18/24: gnu: iotop: Rename to iotop-python., guix-commits, 2022/05/24
- 20/24: gnu: ltris: Update to 1.2.4., guix-commits, 2022/05/24
- 21/24: gnu: editres: Update to 1.0.8., guix-commits, 2022/05/24
- 22/24: gnu: criu: Update to 3.17.,
guix-commits <=
- 24/24: gnu: breezy: Update to 3.2.2., guix-commits, 2022/05/24
- 06/24: gnu: psmisc: Update to 23.5., guix-commits, 2022/05/24
- 03/24: gnu: ytnef: Don't build static library., guix-commits, 2022/05/24
- 07/24: gnu: fakeroot: Update to 1.28., guix-commits, 2022/05/24
- 14/24: gnu: asco: Update to 0.4.11., guix-commits, 2022/05/24
- 16/24: gnu: cowsay: Update to 3.7.0., guix-commits, 2022/05/24
- 12/24: gnu: libite: Don't build static library., guix-commits, 2022/05/24
- 11/24: gnu: libite: Update to 2.5.2., guix-commits, 2022/05/24
- 13/24: gnu: ropgadget: Use HTTPS home page., guix-commits, 2022/05/24
- 15/24: gnu: asco: Use SEARCH-INPUT-FILE., guix-commits, 2022/05/24