2013-02-09 18:09:35 +00:00
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2016-05-26 21:37:54 +00:00
|
|
|
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
2016-02-03 02:57:43 +00:00
|
|
|
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
|
gnu: qemu: Update to 2.5.1.
* gnu/packages/qemu.scm (qemu): Update to 2.5.1.
[source]: Remove patches.
* gnu/packages/patches/qemu-usb-ehci-oob-read.patch,
gnu/packages/patches/qemu-virtio-9p-use-accessor-to-get-thread-pool.patch,
gnu/packages/patches/qemu-CVE-2015-8558.patch,
gnu/packages/patches/qemu-CVE-2015-8567.patch,
gnu/packages/patches/qemu-CVE-2015-8613.patch,
gnu/packages/patches/qemu-CVE-2015-8619.patch,
gnu/packages/patches/qemu-CVE-2015-8701.patch,
gnu/packages/patches/qemu-CVE-2015-8743.patch,
gnu/packages/patches/qemu-CVE-2016-1568.patch,
gnu/packages/patches/qemu-CVE-2016-1922.patch,
gnu/packages/patches/qemu-CVE-2016-1981.patch,
gnu/packages/patches/qemu-CVE-2016-2197.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.
2016-05-09 17:43:35 +00:00
|
|
|
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
2013-02-09 18:09:35 +00:00
|
|
|
;;;
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
;;;
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
;;; your option) any later version.
|
|
|
|
;;;
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
;;;
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
(define-module (gnu packages qemu)
|
2013-02-16 01:09:10 +00:00
|
|
|
#:use-module (gnu packages)
|
2013-02-10 17:28:00 +00:00
|
|
|
#:use-module (gnu packages autotools)
|
2016-07-29 08:23:55 +00:00
|
|
|
#:use-module (gnu packages attr)
|
2013-02-09 18:09:35 +00:00
|
|
|
#:use-module (gnu packages compression)
|
2016-07-29 08:23:55 +00:00
|
|
|
#:use-module (gnu packages gl)
|
|
|
|
#:use-module (gnu packages glib)
|
gnu: Consolidate libjpeg, libpng, and libtiff into one module.
* gnu/packages/image.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add image.scm and remove libjpeg.scm,
libpng.scm, and libtiff.scm.
* gnu/packages/libjpeg.scm, gnu/packages/libpng.scm, gnu/packages/libtiff.scm:
Delete files.
* gnu/packages/emacs.scm gnu/packages/games.scm, gnu/packages/gd.scm,
gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
gnu/packages/gimp.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
gnu/packages/gnustep.scm, gnu/packages/gnuzilla.scm,
gnu/packages/graphviz.scm, gnu/packages/gtk.scm,
gnu/packages/imagemagick.scm, gnu/packages/inkscape.scm,
gnu/packages/netpbm.scm, gnu/packages/pdf.scm, gnu/packages/plotutils.scm,
gnu/packages/qemu.scm, gnu/packages/qt.scm, gnu/packages/scheme.scm,
gnu/packages/sdl.scm, gnu/packages/slim.scm, gnu/packages/tcl.scm,
gnu/packages/texlive.scm, gnu/packages/video.scm, gnu/packages/xiph.scm,
gnu/packages/xorg.scm: Use (gnu packages image) module.
2014-06-25 12:39:02 +00:00
|
|
|
#:use-module (gnu packages image)
|
2015-05-15 22:13:59 +00:00
|
|
|
#:use-module (gnu packages libusb)
|
2016-07-29 08:23:55 +00:00
|
|
|
#:use-module (gnu packages linux)
|
|
|
|
#:use-module (gnu packages ncurses)
|
2015-11-20 23:34:32 +00:00
|
|
|
#:use-module (gnu packages perl)
|
2016-07-29 08:23:55 +00:00
|
|
|
#:use-module (gnu packages pkg-config)
|
|
|
|
#:use-module (gnu packages python)
|
|
|
|
#:use-module (gnu packages sdl)
|
|
|
|
#:use-module (gnu packages texinfo)
|
|
|
|
#:use-module (gnu packages xdisorg)
|
|
|
|
#:use-module (guix build-system gnu)
|
|
|
|
#:use-module (guix download)
|
|
|
|
#:use-module ((guix licenses) #:select (gpl2))
|
|
|
|
#:use-module (guix packages)
|
|
|
|
#:use-module (guix utils)
|
2015-11-20 23:34:32 +00:00
|
|
|
#:use-module (srfi srfi-1))
|
2013-02-09 18:09:35 +00:00
|
|
|
|
2015-10-19 15:55:18 +00:00
|
|
|
(define (qemu-patch commit file-name sha256)
|
|
|
|
"Return an origin for COMMIT."
|
|
|
|
(origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (string-append
|
|
|
|
"http://git.qemu.org/?p=qemu.git;a=commitdiff_plain;h="
|
|
|
|
commit))
|
|
|
|
(sha256 sha256)
|
|
|
|
(file-name file-name)))
|
|
|
|
|
2015-11-20 23:34:32 +00:00
|
|
|
(define-public qemu
|
2013-02-09 18:09:35 +00:00
|
|
|
(package
|
2015-11-20 23:34:32 +00:00
|
|
|
(name "qemu")
|
2016-05-12 15:48:35 +00:00
|
|
|
(version "2.6.0")
|
2013-02-09 18:09:35 +00:00
|
|
|
(source (origin
|
|
|
|
(method url-fetch)
|
2013-08-16 21:55:51 +00:00
|
|
|
(uri (string-append "http://wiki.qemu-project.org/download/qemu-"
|
|
|
|
version ".tar.bz2"))
|
2013-02-09 18:09:35 +00:00
|
|
|
(sha256
|
|
|
|
(base32
|
2016-05-12 15:48:35 +00:00
|
|
|
"1v1lhhd6m59hqgmiz100g779rjq70pik5v4b3g936ci73djlmb69"))))
|
2013-02-09 18:09:35 +00:00
|
|
|
(build-system gnu-build-system)
|
|
|
|
(arguments
|
2016-05-26 21:37:54 +00:00
|
|
|
'(;; Running tests in parallel can occasionally lead to failures, like:
|
|
|
|
;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead)
|
|
|
|
#:parallel-tests? #f
|
|
|
|
|
2016-05-26 21:39:46 +00:00
|
|
|
#:phases
|
|
|
|
(modify-phases %standard-phases
|
|
|
|
(replace 'configure
|
|
|
|
(lambda* (#:key inputs outputs (configure-flags '())
|
2015-08-16 11:03:53 +00:00
|
|
|
#:allow-other-keys)
|
2016-05-26 21:39:46 +00:00
|
|
|
;; The `configure' script doesn't understand some of the
|
|
|
|
;; GNU options. Thus, add a new phase that's compatible.
|
|
|
|
(let ((out (assoc-ref outputs "out")))
|
|
|
|
(setenv "SHELL" (which "bash"))
|
2013-02-09 18:09:35 +00:00
|
|
|
|
2016-05-26 21:39:46 +00:00
|
|
|
;; While we're at it, patch for tests.
|
|
|
|
(substitute* "tests/libqtest.c"
|
|
|
|
(("/bin/sh") (which "sh")))
|
2013-08-16 21:55:51 +00:00
|
|
|
|
2016-05-26 21:39:46 +00:00
|
|
|
;; The binaries need to be linked against -lrt.
|
|
|
|
(setenv "LDFLAGS" "-lrt")
|
|
|
|
(zero?
|
|
|
|
(apply system*
|
|
|
|
`("./configure"
|
|
|
|
,(string-append "--cc=" (which "gcc"))
|
|
|
|
"--disable-debug-info" ; save build space
|
|
|
|
"--enable-virtfs" ; just to be sure
|
|
|
|
,(string-append "--prefix=" out)
|
|
|
|
,@configure-flags))))))
|
|
|
|
(add-after 'install 'install-info
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
;; Install the Info manual, unless Texinfo is missing.
|
|
|
|
(or (not (assoc-ref inputs "texinfo"))
|
|
|
|
(let ((out (assoc-ref outputs "out")))
|
|
|
|
(and (zero? (system* "make" "info"))
|
|
|
|
(let ((infodir (string-append out "/share/info")))
|
|
|
|
(mkdir-p infodir)
|
|
|
|
(for-each (lambda (info)
|
2016-05-26 21:40:27 +00:00
|
|
|
(install-file info infodir))
|
2016-05-26 21:39:46 +00:00
|
|
|
(find-files "." "\\.info$"))
|
|
|
|
#t))))))
|
2016-05-26 21:57:15 +00:00
|
|
|
(add-before 'check 'make-gtester-verbose
|
|
|
|
(lambda _
|
|
|
|
;; Make GTester verbose to facilitate investigation upon failure.
|
|
|
|
(setenv "V" "1")))
|
2016-05-26 21:39:46 +00:00
|
|
|
(add-before 'check 'disable-test-qga
|
|
|
|
(lambda _
|
|
|
|
(substitute* "tests/Makefile"
|
|
|
|
;; Comment out the test-qga test, which needs /sys and
|
|
|
|
;; fails within the build environment.
|
|
|
|
(("check-unit-.* tests/test-qga" all)
|
|
|
|
(string-append "# " all)))
|
|
|
|
#t)))))
|
2013-02-09 18:09:35 +00:00
|
|
|
(inputs ; TODO: Add optional inputs.
|
2016-07-30 08:34:14 +00:00
|
|
|
`(("alsa-lib" ,alsa-lib)
|
|
|
|
("attr" ,attr)
|
2013-02-09 18:09:35 +00:00
|
|
|
("glib" ,glib)
|
2016-07-30 08:34:14 +00:00
|
|
|
;; ("libaio" ,libaio)
|
|
|
|
("libattr" ,attr)
|
|
|
|
("libcap" ,libcap) ; virtfs support requires libcap & libattr
|
2013-02-09 18:09:35 +00:00
|
|
|
("libjpeg" ,libjpeg-8)
|
2016-07-30 08:34:14 +00:00
|
|
|
("libpng" ,libpng)
|
|
|
|
("libusb" ,libusb) ;USB pass-through support
|
|
|
|
("mesa" ,mesa)
|
|
|
|
("ncurses" ,ncurses)
|
|
|
|
;; ("pciutils" ,pciutils)
|
2013-07-02 23:04:57 +00:00
|
|
|
("pixman" ,pixman)
|
2016-07-30 08:34:14 +00:00
|
|
|
("sdl" ,sdl)
|
2013-02-09 18:09:35 +00:00
|
|
|
("util-linux" ,util-linux)
|
2016-07-30 08:34:14 +00:00
|
|
|
;; ("vde2" ,vde2)
|
|
|
|
("zlib" ,zlib)))
|
|
|
|
(native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc.
|
|
|
|
("perl" ,perl)
|
|
|
|
("pkg-config" ,pkg-config)
|
gnu: Move numerous "inputs" which should be "native-inputs".
* gnu/packages/avahi.scm, gnu/packages/cdrom.scm, gnu/packages/cryptsetup.scm,
gnu/packages/curl.scm, gnu/packages/emacs.scm, gnu/packages/fontutils.scm,
gnu/packages/gdb.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphviz.scm,
gnu/packages/groff.scm, gnu/packages/gstreamer.scm, gnu/packages/gtk.scm,
gnu/packages/gv.scm, gnu/packages/imagemagick.scm, gnu/packages/irssi.scm,
gnu/packages/kde.scm, gnu/packages/libcanberra.scm, gnu/packages/libtiff.scm,
gnu/packages/linux.scm, gnu/packages/lvm.scm, gnu/packages/mp3.scm,
gnu/packages/netpbm.scm, gnu/packages/parted.scm, gnu/packages/pdf.scm,
gnu/packages/pulseaudio.scm, gnu/packages/qemu.scm, gnu/packages/qt.scm,
gnu/packages/ratpoison.scm, gnu/packages/rdf.scm, gnu/packages/slim.scm,
gnu/packages/texlive.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
gnu/packages/xml.scm, gnu/packages/xnee.scm, gnu/packages/xorg.scm,
gnu/packages/zip.scm: Move some build-time dependencies from `inputs' to
`native-inputs'.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2013-12-15 11:01:56 +00:00
|
|
|
("python" ,python-2) ; incompatible with Python 3 according to error message
|
2016-07-30 08:34:14 +00:00
|
|
|
("texinfo" ,texinfo)))
|
2013-07-02 23:04:57 +00:00
|
|
|
(home-page "http://www.qemu-project.org")
|
2015-11-20 23:34:32 +00:00
|
|
|
(synopsis "Machine emulator and virtualizer")
|
2013-02-10 17:28:00 +00:00
|
|
|
(description
|
2013-08-16 21:55:51 +00:00
|
|
|
"QEMU is a generic machine emulator and virtualizer.
|
2013-02-10 17:28:00 +00:00
|
|
|
|
|
|
|
When used as a machine emulator, QEMU can run OSes and programs made for one
|
2013-08-16 21:55:51 +00:00
|
|
|
machine (e.g. an ARM board) on a different machine---e.g., your own PC. By
|
|
|
|
using dynamic translation, it achieves very good performance.
|
2013-02-10 17:28:00 +00:00
|
|
|
|
|
|
|
When used as a virtualizer, QEMU achieves near native performances by
|
|
|
|
executing the guest code directly on the host CPU. QEMU supports
|
|
|
|
virtualization when executing under the Xen hypervisor or using
|
|
|
|
the KVM kernel module in Linux. When using KVM, QEMU can virtualize x86,
|
2013-08-16 21:55:51 +00:00
|
|
|
server and embedded PowerPC, and S390 guests.")
|
|
|
|
|
|
|
|
;; Many files are GPLv2+, but some are GPLv2-only---e.g., `memory.c'.
|
2014-10-28 00:14:34 +00:00
|
|
|
(license gpl2)
|
|
|
|
|
|
|
|
;; Several tests fail on MIPS; see <http://hydra.gnu.org/build/117914>.
|
|
|
|
(supported-systems (delete "mips64el-linux" %supported-systems))))
|
2013-08-16 21:55:51 +00:00
|
|
|
|
2015-11-20 23:34:32 +00:00
|
|
|
(define-public qemu-minimal
|
|
|
|
;; QEMU without GUI support.
|
|
|
|
(package (inherit qemu)
|
|
|
|
(name "qemu-minimal")
|
|
|
|
(synopsis "Machine emulator and virtualizer (without GUI)")
|
|
|
|
(arguments
|
|
|
|
`(#:configure-flags
|
|
|
|
;; Restrict to the targets supported by Guix.
|
|
|
|
'("--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu,arm-softmmu")
|
|
|
|
,@(package-arguments qemu)))
|
|
|
|
|
|
|
|
;; Remove dependencies on optional libraries, notably GUI libraries.
|
|
|
|
(inputs (fold alist-delete (package-inputs qemu)
|
2016-07-30 08:34:14 +00:00
|
|
|
'("libusb" "mesa" "sdl")))))
|