GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-30 06:08:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

back to 6.0.0 for qemu

Browse source
This commit is contained in:
Yann Dupont 2021-09-16 15:06:32 +02:00
parent a748f499ea
commit 7d4e08f4ed
1 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gnu/packages/glicid.scm
View file

@ -621,7 +621,7 @@ in the @code{debug} output), and binutils.")))
(package (package
(inherit rdma-core) (inherit rdma-core)
(name "glicid-specific-rdma-core-gcc-11") (name "glicid-specific-rdma-core-gcc-11")
(version "34.0") (version "36.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core" (uri (string-append "https://github.com/linux-rdma/rdma-core"
@ -1498,7 +1498,8 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.")
(package (package
(inherit qemu) (inherit qemu)
(name "glicid-qemu") (name "glicid-qemu")
(version "6.1.0") ; (version "6.1.0") ;; hang on check with version 6.1.0
(version "6.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1506,14 +1507,16 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f")) ; 6.1.0 ; "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f")
"1f9hz8rf12jm8baa7kda34yl4hyl0xh0c4ap03krfjx23i3img47"
)
) )
) )
) )
) )
)
(define-public qemu-with-rbd (define-public qemu-with-rbd
@ -1522,39 +1525,17 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.")
(package (package
(inherit glicid-qemu) (inherit glicid-qemu)
(name "qemu-with-rbd") (name "qemu-with-rbd")
; (arguments
; `(#:configure-flags
; (let ((gcc (string-append (assoc-ref %build-inputs "gcc") "/bin/gcc"))
; (out (assoc-ref %outputs "out")))
; (list (string-append "--cc=" gcc)
; ;; Some architectures insist on using HOST_CC.
; (string-append "--host-cc=" gcc)
; (string-append "--prefix=" out)
; "--sysconfdir=/etc"
; (string-append "--smbd=" out "/libexec/samba-wrapper")
; "--disable-debug-info --enable-rbd" ;for space considerations
; ;; The binaries need to be linked against -lrt.
; (string-append "--extra-ldflags=-lrt")))
; ;; Make build and test output verbose to facilitate investigation upon failure.
; ))
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments
`(#:tests? #f `(#:tests? #f
,@(package-arguments glicid-qemu))) ,@(package-arguments glicid-qemu)))
) )
(inputs `(("glicid-ceph:lib", glicid-ceph "lib" ) (inputs `(("glicid-ceph:lib", glicid-ceph "lib" )
,@(package-inputs glicid-qemu))) ,@(package-inputs glicid-qemu)))
) )
) )