From patchwork Sat Jul 4 23:04:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3245 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 49znV91QRcz3xHb for ; Sat, 4 Jul 2020 23:05:05 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49znV70grKz2Jw; Sat, 4 Jul 2020 23:05:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49znV62QMzz2yyN; Sat, 4 Jul 2020 23:05:02 +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 49znV512B8z2xcM for ; Sat, 4 Jul 2020 23:05:01 +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 49znV454hDzT5 for ; Sat, 4 Jul 2020 23:05:00 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1593903900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=8Pvd6e6Mh4TOZ93PaNJBg0Pj21F0WbrV+mNeS0qgksc=; b=5gTEeJesFXwCi6HFTTRPUm7qsGB3V1kXE33YbJzSmyecoFxI7UDuq2ughquGp6QaaLEuYX m5NnXjFXyivW7hCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1593903900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=8Pvd6e6Mh4TOZ93PaNJBg0Pj21F0WbrV+mNeS0qgksc=; b=TAIZhul1xk9oQG6qr+SuagpzKT5YtpuAewRtOCoYvwevMC3bphQlktQBjkmYZuvdvkonym Twcwu6702xQm1L+cewALVtNh6cVLyqOZ+E6WidydqqhNoBg1bLuLaf0fB3+lR5E8047UAg 9Jnonc7PwwcXWAGmSnXW0+LC1O1/Rkag+22EIOOSY1ayWb/eGorlMRm4FAAXtbaPSYbE+V kivBHtxRb3itWCVJcD8QBy9yAY4F15tySfPCbl5xdt4xb4qlPa3+JYnYn53W9+QAg42ZHo 9RrN+E27DLIJZ+vj9BiuHzA5slyu8qMTOeucwYL9PKxVqqjQiD5PDGoH8xRMDQ== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 3/3] qemu: Update to 5.0.0 Date: Sun, 5 Jul 2020 01:04:51 +0200 Message-Id: <20200704230451.14929-3-matthias.fischer@ipfire.org> In-Reply-To: <20200704230451.14929-1-matthias.fischer@ipfire.org> References: <20200704230451.14929-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org 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" For details see: https://wiki.qemu.org/ChangeLog/5.0 Signed-off-by: Matthias Fischer --- config/rootfiles/packages/qemu | 7 ++++++- lfs/qemu | 29 ++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 10 deletions(-) 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 # +# Copyright (C) 2007-2020 IPFire Team # # # # 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