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

Merge branch 'qemu' into 'main'

Browse source 
updating qemu

See merge request glicid-public/guix-glicid!373
This commit is contained in:
Jean-François GUILLAUME 2024-02-17 15:31:16 +00:00
commit e482c36ef9
1 changed files with 74 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
glicid/packages/virtualization.scm
View file

@ -14,38 +14,81 @@
qemu-minimal) qemu-minimal)
(define-public qemu-with-rbd (define-public qemu-with-rbd
(package (package
(inherit qemu-latest) (inherit qemu-latest)
(name "qemu-with-rbd") (version "8.2.1")
(arguments (name "qemu-with-rbd")
(substitute-keyword-arguments (package-arguments qemu) (source
((#:tests? _ #f) (origin
#f))) (method url-fetch)
(inputs `(("ceph:lib" ,ceph "lib") (uri (string-append "https://download.qemu.org/qemu-"version ".tar.xz"))
,@(package-inputs qemu))))) (sha256 (base32 "1gi9fyc6sk632bnqqp1jy1qciqxbamsva8jzghc9spqpb08paql5"))
(patches (search-patches "qemu-disable-some-qtests-tests.patch"
"qemu-fix-agent-paths.patch"))
(modules '((guix build utils)))
(snippet
'(begin
(with-directory-excursion "pc-bios"
(for-each delete-file (find-files "." "^(bios|vgabios).*\\.bin$"))
(delete-file "openbios-ppc")
(delete-file "opensbi-riscv64-generic-fw_dynamic.bin")
(for-each delete-file (find-files "." "^(efi|pxe)-.*\\.rom$")))
(for-each delete-file-recursively
'("subprojects/dtc"
"roms/ipxe"
"roms/openbios"
"roms/opensbi"
"roms/seabios"))))))
(arguments
(substitute-keyword-arguments (package-arguments qemu)
((#:tests? _ #f)
#f)))
(inputs `(("ceph:lib" ,ceph "lib")
,@(package-inputs qemu)))))
(define-public qemu-minimal-with-rbd (define-public qemu-minimal-with-rbd
(package (package
(inherit qemu-minimal-latest) (inherit qemu-minimal-latest)
(name "qemu-minimal-with-rbd") (version "8.2.1")
(arguments (name "qemu-minimal-with-rbd")
(substitute-keyword-arguments `(#:tests? #f (source
,@(package-arguments qemu-minimal)) (origin
)) (method url-fetch)
(inputs `(("ceph:lib" ,ceph "lib") (uri (string-append "https://download.qemu.org/qemu-"version ".tar.xz"))
,@(package-inputs qemu-minimal))))) (sha256 (base32 "1gi9fyc6sk632bnqqp1jy1qciqxbamsva8jzghc9spqpb08paql5"))
(patches (search-patches "qemu-fix-agent-paths.patch"))
(modules '((guix build utils)))
(snippet
'(begin
(with-directory-excursion "pc-bios"
(for-each delete-file (find-files "." "^(bios|vgabios).*\\.bin$"))
(delete-file "openbios-ppc")
(delete-file "opensbi-riscv64-generic-fw_dynamic.bin")
(for-each delete-file (find-files "." "^(efi|pxe)-.*\\.rom$")))
(for-each delete-file-recursively
'("subprojects/dtc"
"roms/ipxe"
"roms/openbios"
"roms/opensbi"
"roms/seabios"))))))
(arguments
(substitute-keyword-arguments `(#:tests? #f
,@(package-arguments qemu-minimal))
))
(inputs `(("ceph:lib" ,ceph "lib")
,@(package-inputs qemu-minimal)))))
(define-public libvirt-8.5 (define-public libvirt-8.5
(package (package
(inherit libvirt) (inherit libvirt)
(name "libvirt") (name "libvirt")
(version "8.5.0") (version "8.5.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://libvirt.org/sources/libvirt-" (uri (string-append "https://libvirt.org/sources/libvirt-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0")) "0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0"))
(patches (search-patches (patches (search-patches
"glicid/packages/patches/glicid-libvirt-add-install-prefix.patch")))))) "glicid/packages/patches/glicid-libvirt-add-install-prefix.patch"))))))