From patchwork Sun Nov 10 13:03:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonatan Schlag X-Patchwork-Id: 2586 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 479vMX0b0rz43Tk for ; Sun, 10 Nov 2019 13:03:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 479vMV12jjz3Bx; Sun, 10 Nov 2019 13:03:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 479vMT5tDPz2ybD; Sun, 10 Nov 2019 13:03:33 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 479vMR1nm1z2ybJ for ; Sun, 10 Nov 2019 13:03:31 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 479vMQ633hz2ZV; Sun, 10 Nov 2019 13:03:30 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1573391010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IXG/nPRnXY0YNSU/7ImGodvhUuPAaTyLu7rWSYXWPMU=; b=9VriHrOzkvDcSUtTCTx95U3CYFE1p+0DI/o8gZbSPjTR8dK/+5QWT3vlKENd9PSAfdGpdI AzHdjxdD/EO7mCCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1573391010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IXG/nPRnXY0YNSU/7ImGodvhUuPAaTyLu7rWSYXWPMU=; b=CQh/pqIs2CKZRd+kua2UriBm+F7owESNzL6e9rWphrDi3tbxouGXvqistxvSfq3MpfM+fr 5anrGx2eNj7TONGVdn1nMkHj9noGIPC2BgR7rOt8VlrsdIHLru1E/JIGW7lJK6mnVdw/Pj 31hX7sWJJ8ToHqBpiYqSVI5q6Pqaq0XWK04CrTO8UVvwDA9wxmsbTCypxutH6usHhcUd9I DB962KsT3jDlc+tHem3/OGOa0bC/Cp7tQ/odq4yhyWgs2YKYyfNLiIA1M/uKlyIfBpHcWN qSHauXO/oi2H0mhmbxcrNevr1RstDSgV4WpiHyPZS0bDG8reBpDh9/0fKcbZtA== From: Jonatan Schlag To: development@lists.ipfire.org Subject: [PATCH 6/6] Update qemu to version 4.1.0 Date: Sun, 10 Nov 2019 13:03:02 +0000 Message-Id: <20191110130302.21867-6-jonatan.schlag@ipfire.org> In-Reply-To: <20191110130302.21867-1-jonatan.schlag@ipfire.org> References: <20191110130302.21867-1-jonatan.schlag@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Jonatan Schlag --- config/rootfiles/packages/qemu | 80 ++++++++++++++----- lfs/qemu | 7 +- src/patches/qemu-2.11.0-memfd-collision.patch | 57 ------------- 3 files changed, 63 insertions(+), 81 deletions(-) delete mode 100644 src/patches/qemu-2.11.0-memfd-collision.patch diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index dbd900179..e5c0cd189 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -1,8 +1,10 @@ lib/udev/rules.d/65-kvm.rules +usr/bin/elf2dmp usr/bin/ivshmem-client usr/bin/ivshmem-server usr/bin/qemu usr/bin/qemu-arm +usr/bin/qemu-edid usr/bin/qemu-ga usr/bin/qemu-i386 usr/bin/qemu-img @@ -14,27 +16,53 @@ usr/bin/qemu-system-i386 usr/bin/qemu-system-x86_64 usr/bin/qemu-x86_64 usr/libexec/qemu-bridge-helper -#usr/share/doc/qemu -#usr/share/doc/qemu/qemu-doc.html -#usr/share/doc/qemu/qemu-doc.txt -#usr/share/doc/qemu/qemu-ga-ref.html -#usr/share/doc/qemu/qemu-ga-ref.txt -#usr/share/doc/qemu/qemu-qmp-ref.html -#usr/share/doc/qemu/qemu-qmp-ref.txt -#usr/share/man/man1/qemu-img.1 -#usr/share/man/man1/qemu.1 -#usr/share/man/man7/qemu-block-drivers.7 -#usr/share/man/man7/qemu-ga-ref.7 -#usr/share/man/man7/qemu-qmp-ref.7 -#usr/share/man/man8/qemu-ga.8 -#usr/share/man/man8/qemu-nbd.8 +#usr/share/applications/qemu.desktop +#usr/share/icons +#usr/share/icons/hicolor +#usr/share/icons/hicolor/128x128 +#usr/share/icons/hicolor/128x128/apps +#usr/share/icons/hicolor/128x128/apps/qemu.png +#usr/share/icons/hicolor/16x16 +#usr/share/icons/hicolor/16x16/apps +#usr/share/icons/hicolor/16x16/apps/qemu.png +#usr/share/icons/hicolor/24x24 +#usr/share/icons/hicolor/24x24/apps +#usr/share/icons/hicolor/24x24/apps/qemu.png +#usr/share/icons/hicolor/256x256 +#usr/share/icons/hicolor/256x256/apps +#usr/share/icons/hicolor/256x256/apps/qemu.png +#usr/share/icons/hicolor/32x32 +#usr/share/icons/hicolor/32x32/apps +#usr/share/icons/hicolor/32x32/apps/qemu.bmp +#usr/share/icons/hicolor/32x32/apps/qemu.png +#usr/share/icons/hicolor/48x48 +#usr/share/icons/hicolor/48x48/apps +#usr/share/icons/hicolor/48x48/apps/qemu.png +#usr/share/icons/hicolor/512x512 +#usr/share/icons/hicolor/512x512/apps +#usr/share/icons/hicolor/512x512/apps/qemu.png +#usr/share/icons/hicolor/64x64 +#usr/share/icons/hicolor/64x64/apps +#usr/share/icons/hicolor/64x64/apps/qemu.png +#usr/share/icons/hicolor/scalable +#usr/share/icons/hicolor/scalable/apps +#usr/share/icons/hicolor/scalable/apps/qemu.svg #usr/share/qemu usr/share/qemu/QEMU,cgthree.bin usr/share/qemu/QEMU,tcx.bin -usr/share/qemu/acpi-dsdt.aml usr/share/qemu/bamboo.dtb usr/share/qemu/bios-256k.bin usr/share/qemu/bios.bin +usr/share/qemu/canyonlands.dtb +usr/share/qemu/edk2-aarch64-code.fd +usr/share/qemu/edk2-arm-code.fd +usr/share/qemu/edk2-arm-vars.fd +usr/share/qemu/edk2-i386-code.fd +usr/share/qemu/edk2-i386-secure-code.fd +usr/share/qemu/edk2-i386-vars.fd +usr/share/qemu/edk2-licenses.txt +usr/share/qemu/edk2-x86_64-code.fd +usr/share/qemu/edk2-x86_64-secure-code.fd usr/share/qemu/efi-e1000.rom usr/share/qemu/efi-e1000e.rom usr/share/qemu/efi-eepro100.rom @@ -43,10 +71,17 @@ usr/share/qemu/efi-pcnet.rom usr/share/qemu/efi-rtl8139.rom usr/share/qemu/efi-virtio.rom usr/share/qemu/efi-vmxnet3.rom +usr/share/qemu/firmware +usr/share/qemu/firmware/50-edk2-i386-secure.json +usr/share/qemu/firmware/50-edk2-x86_64-secure.json +usr/share/qemu/firmware/60-edk2-aarch64.json +usr/share/qemu/firmware/60-edk2-arm.json +usr/share/qemu/firmware/60-edk2-i386.json +usr/share/qemu/firmware/60-edk2-x86_64.json +usr/share/qemu/hppa-firmware.img usr/share/qemu/keymaps usr/share/qemu/keymaps/ar usr/share/qemu/keymaps/bepo -usr/share/qemu/keymaps/common usr/share/qemu/keymaps/cz usr/share/qemu/keymaps/da usr/share/qemu/keymaps/de @@ -69,9 +104,7 @@ usr/share/qemu/keymaps/ja usr/share/qemu/keymaps/lt usr/share/qemu/keymaps/lv usr/share/qemu/keymaps/mk -usr/share/qemu/keymaps/modifiers usr/share/qemu/keymaps/nl -usr/share/qemu/keymaps/nl-be usr/share/qemu/keymaps/no usr/share/qemu/keymaps/pl usr/share/qemu/keymaps/pt @@ -88,18 +121,21 @@ 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-virt-fw_jump.bin +usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin +usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin usr/share/qemu/palcode-clipper usr/share/qemu/petalogix-ml605.dtb usr/share/qemu/petalogix-s3adsp1800.dtb usr/share/qemu/ppc_rom.bin +usr/share/qemu/pvh.bin usr/share/qemu/pxe-e1000.rom usr/share/qemu/pxe-eepro100.rom 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/qemu-icon.bmp -usr/share/qemu/qemu_logo_no_text.svg +usr/share/qemu/qemu-nsis.bmp usr/share/qemu/qemu_vga.ndrv usr/share/qemu/s390-ccw.img usr/share/qemu/s390-netboot.img @@ -108,9 +144,13 @@ 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 +usr/share/qemu/vgabios-ati.bin +usr/share/qemu/vgabios-bochs-display.bin usr/share/qemu/vgabios-cirrus.bin usr/share/qemu/vgabios-qxl.bin +usr/share/qemu/vgabios-ramfb.bin usr/share/qemu/vgabios-stdvga.bin usr/share/qemu/vgabios-virtio.bin usr/share/qemu/vgabios-vmware.bin diff --git a/lfs/qemu b/lfs/qemu index 9fdb6b7b6..0a8cdb544 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -24,7 +24,7 @@ include Config -VER = 2.11.0 +VER = 4.1.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 = 24 +PAK_VER = 25 DEPS = "libusbredir sdl spice libseccomp" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 335994a755bc655e88a87aeb36bfc0b9 +$(DL_FILE)_MD5 = 5862fc984bb955c4c24427d3bceddca5 install : $(TARGET) @@ -78,7 +78,6 @@ $(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-2.11.0-memfd-collision.patch cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --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" \ diff --git a/src/patches/qemu-2.11.0-memfd-collision.patch b/src/patches/qemu-2.11.0-memfd-collision.patch deleted file mode 100644 index 62e8d3800..000000000 --- a/src/patches/qemu-2.11.0-memfd-collision.patch +++ /dev/null @@ -1,57 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Tue, 28 Nov 2017 11:51:27 +0100 -Subject: [PATCH] memfd: fix configure test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Recent glibc added memfd_create in sys/mman.h. This conflicts with -the definition in util/memfd.c: - - /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration - -Fix the configure test, and remove the sys/memfd.h inclusion since the -file actually does not exist---it is a typo in the memfd_create(2) man -page. - -Cc: Marc-André Lureau -Signed-off-by: Paolo Bonzini ---- - configure | 2 +- - util/memfd.c | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 9c8aa5a98b..99ccc1725a 100755 ---- a/configure -+++ b/configure -@@ -3923,7 +3923,7 @@ fi - # check if memfd is supported - memfd=no - cat > $TMPC << EOF --#include -+#include - - int main(void) - { -diff --git a/util/memfd.c b/util/memfd.c -index 4571d1aba8..412e94a405 100644 ---- a/util/memfd.c -+++ b/util/memfd.c -@@ -31,9 +31,7 @@ - - #include "qemu/memfd.h" - --#ifdef CONFIG_MEMFD --#include --#elif defined CONFIG_LINUX -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD - #include - #include - --- -2.11.0