From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] Update qemu to version 2.6
Date: Tue, 05 Jul 2016 11:56:52 +0200
Message-ID: <1467712612-806-1-git-send-email-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6706387062825658844=="
List-Id: <development.lists.ipfire.org>

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

This patch update qemu to version 2.6
For changelogs see:
http://wiki.qemu.org/ChangeLog/2.5
http://wiki.qemu.org/ChangeLog/2.6

Qemu try to built with bluez, but before version 2.6 bluez was not used
by qemu on IPFire, so I think it is better to disable bluez because
nobody needs it before version 2.6 and our bluez  is not the latest
version so I think this will cause more problems than benefits.

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 config/rootfiles/packages/qemu | 5 +++--
 lfs/qemu                       | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index 3b3f361..21b438f 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -85,11 +85,9 @@ usr/share/qemu/pxe-ne2k_pci.rom
 usr/share/qemu/pxe-pcnet.rom
 usr/share/qemu/pxe-rtl8139.rom
 usr/share/qemu/pxe-virtio.rom
-usr/share/qemu/q35-acpi-dsdt.aml
 usr/share/qemu/qemu-icon.bmp
 usr/share/qemu/qemu_logo_no_text.svg
 usr/share/qemu/s390-ccw.img
-usr/share/qemu/s390-zipl.rom
 usr/share/qemu/sgabios.bin
 usr/share/qemu/slof.bin
 usr/share/qemu/spapr-rtas.bin
@@ -102,4 +100,7 @@ usr/share/qemu/vgabios-virtio.bin
 usr/share/qemu/vgabios-vmware.bin
 usr/share/qemu/vgabios.bin
 #usr/var/run
+usr/bin/ivshmem-client
+usr/bin/ivshmem-server
+#usr/share/man/man8/qemu-ga.8
=20
diff --git a/lfs/qemu b/lfs/qemu
index c32953c..62010ee 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 2.4.0
+VER        =3D 2.6.0
=20
 THISAPP    =3D qemu-$(VER)
 DL_FILE    =3D $(THISAPP).tar.bz2
@@ -33,7 +33,7 @@ DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   =3D i586 x86_64
 PROG       =3D qemu
-PAK_VER    =3D 19
+PAK_VER    =3D 20
=20
 DEPS       =3D "sdl spice"
=20
@@ -45,7 +45,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 186ee8194140a484a455f8e3c74589f4
+$(DL_FILE)_MD5 =3D ca3f70b43f093e33e9e014f144067f13
=20
 install : $(TARGET)
=20
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=3D/usr --sysconfdir=3D/etc \
-		--enable-kvm --disable-attr \
+		--enable-kvm --disable-bluez --disable-attr \
 		--target-list=3D"i386-linux-user x86_64-linux-user arm-linux-user i386-sof=
tmmu x86_64-softmmu arm-softmmu" \
 		--extra-cflags=3D"$(CFLAGS)" --enable-spice
 	cd $(DIR_APP) && make $(MAKETUNING)
--=20
2.1.4


--===============6706387062825658844==--