From patchwork Sun May 12 13:20:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Waldemar Brodkorb X-Patchwork-Id: 1934269 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vcjt34fRHz20KK for ; Sun, 12 May 2024 23:20:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 28C104215A; Sun, 12 May 2024 13:20:31 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id G-xNlxKiRjAq; Sun, 12 May 2024 13:20:29 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6D4E44215E Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 6D4E44215E; Sun, 12 May 2024 13:20:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 35CCF1BF588 for ; Sun, 12 May 2024 13:20:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 2030460762 for ; Sun, 12 May 2024 13:20:28 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id EEfR0PsKizMc for ; Sun, 12 May 2024 13:20:27 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1828:2000:679::23; helo=helium.openadk.org; envelope-from=wbx@openadk.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 571606075B DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 571606075B Received: from helium.openadk.org (helium.openadk.org [IPv6:2a00:1828:2000:679::23]) by smtp3.osuosl.org (Postfix) with ESMTPS id 571606075B for ; Sun, 12 May 2024 13:20:25 +0000 (UTC) Received: by helium.openadk.org (Postfix, from userid 1000) id 28F883520FD9; Sun, 12 May 2024 15:20:12 +0200 (CEST) Date: Sun, 12 May 2024 15:20:12 +0200 From: Waldemar Brodkorb To: buildroot@buildroot.org Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Operating-System: Linux 5.10.0-27-amd64 x86_64 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=openadk.org; s=2022; t=1715520012; bh=42a9RS9AxC0bYQOtIEcK94VBgMMhcHZPl2lISP9f9o0=; h=Date:From:To:Cc:Subject:From; b=OEVf2/zCO7Zqt6zaTkKERKf27G4e8N7ECsqkJ2/p6nUKJv8Vih+NA0fmmeCEFABjH NkEK4cwjt+CFT3UQYcG+yv412xnM4LjKkbT8QbgmXMkbYAkdvAEAnuO82bKWWsPVzV j+U2lownyJQCf3P8ls8AS4bKbXxXTaWWnJUGZNLyoBWj9bBY25drZlXMZKABogfZ8Z W1aRSYfg9hP8PWSC2/rGK9uCV4j4O5dn3WTWgZUQt6VoY9f+5Z3Z9zg5nS/h/Qg8MA VDv6ke17wbEDrKY2Fc/pozNJFFbg7y/7ap1pSUZnR53qcHxv/79MFpstqeQoSrKPi9 oW/dk03Qpr9kg== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=none (p=none dis=none) header.from=openadk.org X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=openadk.org header.i=@openadk.org header.a=rsa-sha256 header.s=2022 header.b=OEVf2/zC Subject: [Buildroot] [PATCH] package/qemu: update to 9.0.0 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" See here the changes: https://wiki.qemu.org/ChangeLog/9.0 Disable plugins because of compile errors. Patches 0002/0003 are Upstream. Signed-off-by: Waldemar Brodkorb --- ...comp.c-add-missing-header-for-CLONE_.patch | 42 ------------------- ...-trace-events-file-only-if-necessary.patch | 30 ------------- package/qemu/Config.in | 2 +- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 4 +- 5 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch delete mode 100644 package/qemu/0003-tracing-install-trace-events-file-only-if-necessary.patch diff --git a/package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch b/package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch deleted file mode 100644 index 91506b14d9..0000000000 --- a/package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch +++ /dev/null @@ -1,42 +0,0 @@ -From df07d3754bdf15e0efac244cfee290c9bac86352 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 2 May 2022 23:17:46 +0200 -Subject: [PATCH] softmmu/qemu-seccomp.c: add missing header for CLONE_NEWGROUP -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With seccomp support enabled Qemu 7.0.0 fail to build with the -following error: - -../softmmu/qemu-seccomp.c:116:19: error: ‘CLONE_NEWCGROUP’ undeclared here (not in a function) - 116 | FORBID_CLONE_FLAG(CLONE_NEWCGROUP); - | ^~~~~~~~~~~~~~~ -../softmmu/qemu-seccomp.c:73:18: note: in definition of macro ‘FORBID_CLONE_FLAG’ - 73 | .datum_a = flag, .datum_b = flag } } - | ^~~~ - -CLONE_NEWCGROUP has been added in Qemu 7.0.0 by commit [1]. - -[1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=5a2f693f07a1e93ada5277b2fb1530b2698be0fa - -Signed-off-by: Romain Naour ---- - softmmu/qemu-seccomp.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/softmmu/qemu-seccomp.c b/softmmu/qemu-seccomp.c -index deaf8a4ef5..96c83e121f 100644 ---- a/softmmu/qemu-seccomp.c -+++ b/softmmu/qemu-seccomp.c -@@ -21,6 +21,7 @@ - #include - #include - #include "sysemu/seccomp.h" -+#include - #include - - /* For some architectures (notably ARM) cacheflush is not supported until --- -2.35.1 - diff --git a/package/qemu/0003-tracing-install-trace-events-file-only-if-necessary.patch b/package/qemu/0003-tracing-install-trace-events-file-only-if-necessary.patch deleted file mode 100644 index 36bdaa4978..0000000000 --- a/package/qemu/0003-tracing-install-trace-events-file-only-if-necessary.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5c43da1e4983cc3c209b325a5228b6149e0a0ccf Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Fri, 24 Mar 2023 21:40:22 -0300 -Subject: [PATCH] tracing: install trace events file only if necessary - -It is not useful when configuring with --enable-trace-backends=nop. - -Upstream: https://patchwork.kernel.org/project/qemu-devel/patch/20230408010410.281263-1-casantos@redhat.com/ -Signed-off-by: Carlos Santos -Signed-off-by: Carlos Santos ---- - trace/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/trace/meson.build b/trace/meson.build -index 8e80be895c..30b1d942eb 100644 ---- a/trace/meson.build -+++ b/trace/meson.build -@@ -64,7 +64,7 @@ trace_events_all = custom_target('trace-events-all', - input: trace_events_files, - command: [ 'cat', '@INPUT@' ], - capture: true, -- install: true, -+ install: get_option('trace_backends') != [ 'nop' ], - install_dir: qemu_datadir) - - if 'ust' in get_option('trace_backends') --- -2.31.1 - diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 8d53ced300..91e0de884f 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -289,7 +289,7 @@ config BR2_PACKAGE_QEMU_TARGET_RISCV32 bool "riscv32" select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM help - RISC-V 33-bit architecture. + RISC-V 32-bit architecture. config BR2_PACKAGE_QEMU_TARGET_RISCV64 bool "riscv64" diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 61e51a923f..2c905d2e77 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 37ce2ef5e500fb752f681117c68b45118303ea49a7e26bd54080ced54fab7def qemu-8.1.1.tar.xz +sha256 32708ac66c30d8c892633ea968c771c1c76d597d70ddead21a0d22ccf386da69 qemu-9.0.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index ef406dc8e9..8de803dd25 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -6,7 +6,7 @@ # When updating the version, check whether the list of supported targets # needs to be updated. -QEMU_VERSION = 8.1.1 +QEMU_VERSION = 9.0.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = https://download.qemu.org QEMU_SELINUX_MODULES = qemu virt @@ -320,6 +320,7 @@ define QEMU_CONFIGURE_CMDS --disable-opengl \ --disable-oss \ --disable-pa \ + --disable-plugins \ --disable-rbd \ --disable-sanitizers \ --disable-selinux \ @@ -504,6 +505,7 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-vde \ --disable-vhost-user-blk-server \ --disable-vnc-jpeg \ + --disable-plugins \ --disable-png \ --disable-vnc-sasl \ --enable-slirp \