mirror of
https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git
synced 2025-04-29 21:58:36 +02:00
Merge branch 'qemu' into 'main'
updating qemu See merge request glicid-public/guix-glicid!373
This commit is contained in:
commit
e482c36ef9
1 changed files with 74 additions and 31 deletions
|
@ -14,38 +14,81 @@
|
|||
qemu-minimal)
|
||||
|
||||
(define-public qemu-with-rbd
|
||||
(package
|
||||
(inherit qemu-latest)
|
||||
(name "qemu-with-rbd")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qemu)
|
||||
((#:tests? _ #f)
|
||||
#f)))
|
||||
(inputs `(("ceph:lib" ,ceph "lib")
|
||||
,@(package-inputs qemu)))))
|
||||
(package
|
||||
(inherit qemu-latest)
|
||||
(version "8.2.1")
|
||||
(name "qemu-with-rbd")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qemu.org/qemu-"version ".tar.xz"))
|
||||
(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
|
||||
(package
|
||||
(inherit qemu-minimal-latest)
|
||||
(name "qemu-minimal-with-rbd")
|
||||
(arguments
|
||||
(substitute-keyword-arguments `(#:tests? #f
|
||||
,@(package-arguments qemu-minimal))
|
||||
))
|
||||
(inputs `(("ceph:lib" ,ceph "lib")
|
||||
,@(package-inputs qemu-minimal)))))
|
||||
(package
|
||||
(inherit qemu-minimal-latest)
|
||||
(version "8.2.1")
|
||||
(name "qemu-minimal-with-rbd")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qemu.org/qemu-"version ".tar.xz"))
|
||||
(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
|
||||
(package
|
||||
(inherit libvirt)
|
||||
(name "libvirt")
|
||||
(version "8.5.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://libvirt.org/sources/libvirt-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0"))
|
||||
(patches (search-patches
|
||||
"glicid/packages/patches/glicid-libvirt-add-install-prefix.patch"))))))
|
||||
(package
|
||||
(inherit libvirt)
|
||||
(name "libvirt")
|
||||
(version "8.5.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://libvirt.org/sources/libvirt-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0"))
|
||||
(patches (search-patches
|
||||
"glicid/packages/patches/glicid-libvirt-add-install-prefix.patch"))))))
|
||||
|
|
Loading…
Add table
Reference in a new issue