Update qemu to version 2.6

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@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Jonatan Schlag
2016-07-05 11:56:52 +02:00
committed by Michael Tremer
parent d4641215c7
commit ccb35c191f
2 changed files with 7 additions and 6 deletions

View File

@@ -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

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.4.0
VER = 2.6.0
THISAPP = qemu-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = i586 x86_64
PROG = qemu
PAK_VER = 19
PAK_VER = 20
DEPS = "sdl spice"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 186ee8194140a484a455f8e3c74589f4
$(DL_FILE)_MD5 = ca3f70b43f093e33e9e014f144067f13
install : $(TARGET)
@@ -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=/usr --sysconfdir=/etc \
--enable-kvm --disable-attr \
--enable-kvm --disable-bluez --disable-attr \
--target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \
--extra-cflags="$(CFLAGS)" --enable-spice
cd $(DIR_APP) && make $(MAKETUNING)