diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-11-21 22:44:15 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-11-21 22:44:15 +0100 |
| commit | b60d2bfff95c0859d7814c1fe9d0940c87edc2b4 (patch) | |
| tree | 49d3339f93c9d9fad5c66609a1dc4964f2856f79 /gnu/packages/virtualization.scm | |
| parent | 0c6ab52243353e3417e5a9733bb089e4771cc86e (diff) | |
| parent | a31b9dac1cbda07225fcdffe03d13d68c4eab981 (diff) | |
| download | patches-b60d2bfff95c0859d7814c1fe9d0940c87edc2b4.tar patches-b60d2bfff95c0859d7814c1fe9d0940c87edc2b4.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 904b4e1755..5a62a1796e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -107,23 +107,14 @@ (define-public qemu (package (name "qemu") - (version "4.1.0") + (version "4.1.1") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) (sha256 (base32 - "1ih9v6gxgild3m4g80ld4dr3wp9db3bpy203k73fxgc9hqhn0vk5")) - (patches - (list - ;; Fix an ordering issue with recent kernels, see - ;; <https://bugs.gnu.org/37860>. - (qemu-patch - "bf9e0313c27d8e6ecd7f7de3d63e1cb25d8f6311" - "qemu-tests-make-filemonitor-test-more-robust.patch" - (base32 - "1242wqpr8id3cn88pzbig3sqh4znml0g0h2mwdmdyhp81blq7s7n")))))) + "1lm1jndfpc5sydwrxyiz5sms414zkcg9jdl0zx318qbjsayxnvzd")))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: @@ -300,7 +291,12 @@ server and embedded PowerPC, and S390 guests.") ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary. (native-inputs `(("python-2" ,python-2) ,@(fold alist-delete (package-native-inputs qemu) - '("python-wrapper"))))))) + '("python-wrapper")))) + (inputs + (fold alist-delete (package-inputs qemu) + ;; Disable seccomp support, because it's not required for the GRUB + ;; test suite, and because it fails with libseccomp 2.4.2 and later. + '("libseccomp")))))) (define-public libosinfo (package @@ -385,6 +381,12 @@ all common programming languages. Vala bindings are also provided.") "/share/doc/" ,name "-" ,version) "--sysconfdir=/etc" "--localstatedir=/var") + #:make-flags + ;; Treat the kernel headers as system headers to silence + ;; compiler warnings from those. + (list (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "kernel-headers") + "/include")) #:phases (modify-phases %standard-phases (replace 'install |