diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-03-20 14:54:26 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-03-20 14:54:26 +0000 |
| commit | 8fa07612644339a2bf21be9ee924e6ff1e0ec81d (patch) | |
| tree | dbcb73053fac420077d45b20d9460134818ad2be /gnu/packages/virtualization.scm | |
| parent | ebe30c375495e7232551b32b6771f3c06a676f41 (diff) | |
| parent | 69951a61a1d8f1f2135ea2dc836738be282b97bc (diff) | |
| download | guix-8fa07612644339a2bf21be9ee924e6ff1e0ec81d.tar guix-8fa07612644339a2bf21be9ee924e6ff1e0ec81d.tar.gz | |
Merge remote-tracking branch 'savannah/master' into gnome-team
Change-Id: Iec8e15b79c6fde516294c2bfcaf8ee3575b1f745
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index a66be3d5f0..251fe00aa0 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020, 2021, 2022 Marius Bakke <marius@gnu.org> -;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2021 Leo Famulari <leo@famulari.name> ;;; Copyright © 2021, 2022 Pierre Langlois <pierre.langlois@gmx.com> @@ -169,15 +169,16 @@ (define-public qemu (package (name "qemu") - (version "8.1.3") + (version "8.2.2") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) (sha256 - (base32 "1fv5wbxpjxqzv10bdlq0ykgqfmzqx4s8yfch9zvqcm8h0il1gk23")) - (patches (search-patches "qemu-disable-some-qtests-tests.patch" + (base32 "1wy45fbf4816l4ylsz8b8cbypva9apcdnvlgqfr586icp30lcww4")) + (patches (search-patches "qemu-build-info-manual.patch" + "qemu-disable-bios-tables-test.patch" "qemu-fix-agent-paths.patch")) (modules '((guix build utils))) (snippet @@ -196,7 +197,7 @@ (for-each delete-file (find-files "." "^(efi|pxe)-.*\\.rom$"))) ;; Delete bundled code that we provide externally. (for-each delete-file-recursively - '("subprojects/dtc" + '("roms/u-boot/scripts/dtc" "roms/ipxe" "roms/openbios" "roms/opensbi" @@ -321,10 +322,18 @@ (lambda* (#:key native-inputs inputs #:allow-other-keys) ;; Ensure the executables created by these source files reference ;; /bin/sh from the store so they work inside the build container. - (substitute* '("block/cloop.c" "migration/exec.c" - "net/tap.c" "tests/qtest/libqtest.c" + (substitute* '("block/cloop.c" + "migration/exec.c" + "migration/migration.c" + "net/tap.c" + "util/envlist.c") + (("/bin/sh") + (search-input-file inputs "/bin/sh"))) + ;; For tests, use the native /bin/sh is available. + (substitute* '("tests/qtest/libqtest.c" "tests/qtest/vhost-user-blk-test.c") - (("/bin/sh") (search-input-file inputs "/bin/sh"))) + (("/bin/sh") + (search-input-file (or native-inputs inputs) "/bin/sh"))) (substitute* "tests/qemu-iotests/testenv.py" (("#!/usr/bin/env python3") (string-append "#!" (search-input-file (or native-inputs inputs) |