summary refs log tree commit diff
path: root/gnu/packages/qemu.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-04-09 11:36:56 +0200
committerLudovic Courtès <ludo@gnu.org>2014-04-09 14:01:31 +0200
commite1f88ff0ab1c5bb6c234d27ab0887a73a496073e (patch)
tree0ab164dea68ee6aa588fe6bb4b218c47f165f7b6 /gnu/packages/qemu.scm
parent57e544e8f7f0c907bb1ea3b4432a9a3d3da57365 (diff)
downloadguix-e1f88ff0ab1c5bb6c234d27ab0887a73a496073e.tar.gz
gnu: qemu: Upgrade to 1.7.1; add virtfs support.
* gnu/packages/qemu.scm (qemu-headless): Upgrade to 1.7.1.
  [source]: Remove 'patches' field.
  [arguments]: Add --enable-virtfs configure flag.
  [inputs]: Add libcap and attr.
* gnu/packages/patches/qemu-make-4.0.patch: Remove.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/qemu.scm')
-rw-r--r--gnu/packages/qemu.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm
index e0b9e4aeb1..4567373aa9 100644
--- a/gnu/packages/qemu.scm
+++ b/gnu/packages/qemu.scm
@@ -44,15 +44,14 @@
   ;; This is QEMU without GUI support.
   (package
     (name "qemu-headless")
-    (version "1.6.1")
+    (version "1.7.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "http://wiki.qemu-project.org/download/qemu-"
                                  version ".tar.bz2"))
              (sha256
               (base32
-               "152jc18mjs543k8ggbcwgra8d0zw81z0lcc1r0iq4iqhm926ywzw"))
-             (patches (list (search-patch "qemu-make-4.0.patch")))))
+               "1x5y06zhp0gc97g1sb98vf7dkawg63xywv0mbnpfnbi20jh452fn"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (alist-replace
@@ -74,6 +73,7 @@
                       (system* "./configure"
                                (string-append "--cc=" (which "gcc"))
                                "--disable-debug-info" ; save build space
+                               "--enable-virtfs"      ; just to be sure
                                (string-append "--prefix=" out)
                                (string-append "--smbd=" samba
                                               "/sbin/smbd")))))
@@ -103,6 +103,8 @@
        ("pixman" ,pixman)
        ;; ("vde2" ,vde2)
        ("util-linux" ,util-linux)
+       ("libcap" ,libcap)           ; virtfs support requires libcap & libattr
+       ("libattr" ,attr)
        ;; ("pciutils" ,pciutils)
        ("alsa-lib" ,alsa-lib)
        ("zlib" ,zlib)