[3/3] qemu: Update to 5.0.0

Message ID 20200704230451.14929-3-matthias.fischer@ipfire.org
State New
Headers show
Series
  • [1/3] libvirt: Update to 6.5.0
Related show

Commit Message

Matthias Fischer July 4, 2020, 11:04 p.m. UTC
For details see:
https://wiki.qemu.org/ChangeLog/5.0

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 config/rootfiles/packages/qemu |  7 ++++++-
 lfs/qemu                       | 29 ++++++++++++++++++++---------
 2 files changed, 26 insertions(+), 10 deletions(-)

Patch

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index af9499d2a..60ee05c55 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -11,11 +11,13 @@  usr/bin/qemu-img
 usr/bin/qemu-io
 usr/bin/qemu-nbd
 usr/bin/qemu-pr-helper
+usr/bin/qemu-storage-daemon
 usr/bin/qemu-system-arm
 usr/bin/qemu-system-i386
 usr/bin/qemu-system-x86_64
 usr/bin/qemu-x86_64
 usr/libexec/qemu-bridge-helper
+usr/libexec/virtiofsd
 #usr/share/applications/qemu.desktop
 #usr/share/icons
 #usr/share/icons/hicolor
@@ -52,6 +54,7 @@  usr/libexec/qemu-bridge-helper
 #usr/share/qemu/QEMU,tcx.bin
 #usr/share/qemu/bamboo.dtb
 usr/share/qemu/bios-256k.bin
+usr/share/qemu/bios-microvm.bin
 usr/share/qemu/bios.bin
 #usr/share/qemu/canyonlands.dtb
 #usr/share/qemu/edk2-aarch64-code.fd
@@ -121,6 +124,7 @@  usr/share/qemu/multiboot.bin
 #usr/share/qemu/openbios-ppc
 #usr/share/qemu/openbios-sparc32
 #usr/share/qemu/openbios-sparc64
++usr/share/qemu/opensbi-riscv32-sifive_u-fw_jump.bin
 #usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin
 #usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin
 #usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin
@@ -142,7 +146,6 @@  usr/share/qemu/qemu_vga.ndrv
 usr/share/qemu/sgabios.bin
 #usr/share/qemu/skiboot.lid
 #usr/share/qemu/slof.bin
-#usr/share/qemu/spapr-rtas.bin
 usr/share/qemu/trace-events-all
 usr/share/qemu/u-boot-sam460-20100605.bin
 usr/share/qemu/u-boot.e500
@@ -155,3 +158,5 @@  usr/share/qemu/vgabios-stdvga.bin
 usr/share/qemu/vgabios-virtio.bin
 usr/share/qemu/vgabios-vmware.bin
 usr/share/qemu/vgabios.bin
+usr/share/qemu/vhost-user
+usr/share/qemu/vhost-user/50-qemu-virtiofsd.json
diff --git a/lfs/qemu b/lfs/qemu
index ec5413b29..edd7a78a9 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 4.1.0
+VER        = 5.0.0
 
 THISAPP    = qemu-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -33,7 +33,7 @@  DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 27
+PAK_VER    = 28
 
 DEPS       = libusbredir spice libseccomp
 
@@ -45,7 +45,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = cdf2b5ca52b9abac9bacb5842fa420f8
+$(DL_FILE)_MD5 = ede6005d7143fe994dd089d31dc2cf6c
 
 install : $(TARGET)
 
@@ -78,12 +78,23 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
-		--localstatedir=/var --enable-kvm --disable-bluez --disable-attr \
+
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch
+
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-kvm \
+		--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 --enable-usb-redir --enable-seccomp \
-		--disable-docs --disable-sdl
+		--extra-cflags="$(CFLAGS)" \
+		--enable-spice \
+		--enable-usb-redir \
+		--enable-seccomp \
+		--disable-docs \
+		--disable-sdl
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install