From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <arne_f@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] qemu: Update to 2.7.0
Date: Thu, 20 Oct 2016 20:13:54 +0000
Message-ID: <1476994434-2294-1-git-send-email-arne_f@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0388384620074434750=="
List-Id: <development.lists.ipfire.org>

--===============0388384620074434750==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Enables various modules and adds softmmu support for
ARM, aarch64 and x86_64.

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
 qemu/qemu.nm | 62 ++++++++++++++++++++++++++++++++++++++++++++++++----------=
--
 1 file changed, 50 insertions(+), 12 deletions(-)

diff --git a/qemu/qemu.nm b/qemu/qemu.nm
index 3499c4d..df81107 100644
--- a/qemu/qemu.nm
+++ b/qemu/qemu.nm
@@ -3,12 +3,12 @@
 # Copyright (C) - IPFire Development Team <info(a)ipfire.org>               =
    #
 ############################################################################=
###
=20
-name       =3D qemu-kvm
-version    =3D 0.15.0
+name       =3D qemu
+version    =3D 2.7.0
 release    =3D 1
=20
 groups     =3D Applications/Virtualization
-url        =3D http://www.linux-kvm.org/page/Main_Page
+url        =3D http://www.qemu.org
 license    =3D GPLv2+
 summary    =3D QEMU is a generic and open source machine emulator and virtua=
lizer.
=20
@@ -18,31 +18,69 @@ description
 	architectures.
 end
=20
-source_dl  =3D
+source_dl  =3D http://wiki.qemu-project.org/download/
+sources    =3D %{thisapp}.tar.bz2
=20
 build
 	requires
+		SDL-devel
+		autoconf
+		automake
+		bison
+		bzip2-devel
+		flex
 		glib2-devel
+		gnutls-devel
 		libcurl-devel
+		libgcrypt-devel
+		libjpeg-devel
+		libpng-devel
+		libtasn1-devel
+		libusb-devel
 		libuuid-devel
-		gnutls-devel
+		lzo-devel
 		ncurses-devel
+		nettle-devel
 		pciutils-devel
-		sdl-devel
+		pixman-devel
 		zlib-devel
 	end
=20
+	targets =3D aarch64-softmmu arm-softmmu x86_64-softmmu
+
 	configure_options =3D \
-		--prefix=3D/usr \
-		--enable-kvm \
+		--prefix=3D%{prefix} \
+		--bindir=3D%{bindir} \
+		--sysconfdir=3D%{sysconfdir} \
+		--libdir=3D%{libdir} \
+		--libexecdir=3D%{libdir} \
+		--datadir=3D%{datadir} \
+		--mandir=3D%{mandir} \
+		--localstatedir=3D%{localstatedir} \
 		--extra-cflags=3D"%{CFLAGS}" \
+		--extra-ldflags=3D"%{LDFLAGS}" \
 		--disable-strip \
-		--disable-xen \
-		--sysconfdir=3D/etc \
-		--target-list=3D"i386-softmmu arm-softmmu"
+		--disable-werror \
+		--target-list=3D"%{targets}" \
+		--enable-bzip2 \
+		--enable-fdt \
+		--enable-kvm \
+		--enable-libusb \
+		--enable-lzo \
+		--enable-pie \
+		--enable-vhdx \
+		--enable-vnc \
+		--enable-vnc-jpeg \
+		--enable-vnc-png \
+		--disable-xen
=20
 	configure_cmds
-		sed -e "s(a)-Wl,-rpath,/usr/lib@@g" -i */config-target.mak
+		sed -e "s(a)-Wl,-rpath,%{libdir}@@g" -i config-host.mak
+	end
+
+	install_cmds
+		# Remove BIOS file which is an ELF files w/ invalid interpreter
+		rm -vf %{BUILDROOT}%{datadir}/qemu/s390-ccw.img
 	end
 end
=20
--=20
2.6.3


--===============0388384620074434750==--