From patchwork Sat Apr 22 09:06:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1772241 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q3QW25nWsz1ybF for ; Sat, 22 Apr 2023 19:06:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 80CFC60C0C; Sat, 22 Apr 2023 09:06:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 80CFC60C0C X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R5CHxVptMnZX; Sat, 22 Apr 2023 09:06:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id BEFE860C00; Sat, 22 Apr 2023 09:06:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org BEFE860C00 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 084B61C29B8 for ; Sat, 22 Apr 2023 09:06:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id D484A41D8B for ; Sat, 22 Apr 2023 09:06:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D484A41D8B X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YfbUlqVJrwuK for ; Sat, 22 Apr 2023 09:06:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4FA1441C3F Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by smtp4.osuosl.org (Postfix) with ESMTPS id 4FA1441C3F for ; Sat, 22 Apr 2023 09:06:28 +0000 (UTC) X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.209.208]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MtfNl-1qAA5l0Hpn-00vARC; Sat, 22 Apr 2023 11:06:26 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Sat, 22 Apr 2023 11:06:23 +0200 Message-Id: <20230422090625.25006-1-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:MZyFUU4mstVyKG0zUQJj4G5Gxq6lb8UK4QF5KvAKFbC3rxwjODJ erRa+NZwsyKuj/ST7cUGTgsjNGlb7POhpjycrjjpFurG51kEtj6w7xnZ1fpgLrpPrssd8Q8 P66K8S4Wlqi0xL6BV4j46yp1GAVLf6UM9zsYfNszv1y2SSViwFLvl8TRbp0b5lnLdOVozoF fK/PhsZqfjYg80XJyYxzw== UI-OutboundReport: notjunk:1;M01:P0:knGuL42NYvY=;NXkJ5757nb41xGGF9TCxfk1p0Tp ul05zFSt2Hld5AnQV0XddYKkrq5EzU4YxiSJaKmJPEBWh+RjIHnjrZ16NnPEKgikMNdtrKRNQ uPLQmxNzJ571SeW40Yu6O3Hy3jBDvjOmEqlUq1yHUmp8fqdjVwysfJrqCiicNxC6TG4i96vXg HOZVCII/9VPjVQ9AZRvfy1dyzwUhl4Qtu/adKj+Nl0QT4IGndRE8FZFMF724544nNb1zFG2TX 2ATv8ty86SsG1yI6V4zuc8AMtE1xfoY4mm2d8z/ALpD8hKCGDY1Xtj10c9jZZPoe49NbQak3X dtK5ozGY9cxtipg8IAIukdK9W1yR+1XIvzq2A7tpN8EBQB8o4rAWAWou1TMfUOZGNcuus9cS+ sz4wLIhMdp6/9yzPQRdfi7zURYtnY1rKkAp/8hQ2FM/N0dDplGXYi9jHAe7OfGeLLKdpqbFqE 0g0iLbAorDx14/IgolUsuXsmpNKk0fTr3B4N7r8CKZyi9ntyhpPFmFoUnsrrsJsjrAQ/9zvsK CZxwGeXb0UcwPd25/ueN5EHQ5CxmgZy+YVbx0AUiR9MeXAytKKgzCl13/L2ENMAZhlRtp60yS aNKeoa1rpE2egm7W0y80Bzn/SSmfOL/56qLj+gw0WJmmZknNr4MLK8bwpuPtf/lRFPTfyoiDe vYiD7UIeLPFPHoBNLD/6JbM4fBDNlbUmE2voqKCMoBGOt+mb4hIkNcQMfYtUe9RTsGm9MEGNU DS3T284ka8gFJ2SNmmDcUhq/68Qn9Q6G17Z8SVEQvlfo5pWh9efqSyr0L9IoS3Lx/eC58n6hY Ps/j9iT8z9E9a4Q3BIAyWl0iAAcqyd3wOyRvBPWKqdoijQWm+4oA1z+JOYoEkj3PoDqtHq+jE LmI0HA13ybj2qE/iRPYhNqE+kZu0BO22PkjbDwhs8t9Detz/h8MAORCuzOOOCNSJ+HGcSGS+I UmZ4blXIJInymU6H5RCwtt4+qHc= X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1682154386; i=ps.report@gmx.net; bh=TJAM3NNscGhHlA6bYISsCV2TCnH0Tc7X4o1mAv7AQIo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=L9+nK3Rm8ksxFq+miwj4PBHEE1bTiWY+6YIehoyoQKdKdqOj7LKXOYM9UnroUfaW8 tcsFg0fmmDMoAjT7KgBKnhS7vzMSEryxK/ib7kCmg3To8OD5ZXdEJlLxWpL0P8dwqf EZ3Tb1bH2lo42vPDzFzDmFLHIPE5Gy/qHfTriw38mxtVU9p4OZFSO1HTazBjuopXuO IHBoODAwikF4pJszK9ebcedRBWx+R18alKftbEyFypygQ87+Rmk4zcof+K6nxrZF8d lnpomWHzW0kwHW7PYRj8+mPScjSYM8NGDItlgFvA51umYYSybJm1MVd9cxJ1IM6YCD 889Lo6FyZRhIQ== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.a=rsa-sha256 header.s=s31663417 header.b=L9+nK3Rm Subject: [Buildroot] [PATCH v1 1/3] package/qemu: change project and download URL to https 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" Signed-off-by: Peter Seiderer Acked-by: Romain Naour --- package/qemu/Config.in | 2 +- package/qemu/qemu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index a446c0cf68..235fdb9ce6 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -43,7 +43,7 @@ menuconfig BR2_PACKAGE_QEMU Linux. When using KVM, QEMU can virtualize x86, server and embedded PowerPC, and S390 guests. - http://qemu.org/ + https://www.qemu.org/ if BR2_PACKAGE_QEMU diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 3cbeffe213..3f51cb572b 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -8,7 +8,7 @@ # needs to be updated. QEMU_VERSION = 7.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz -QEMU_SITE = http://download.qemu.org +QEMU_SITE = https://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c QEMU_LICENSE_FILES = COPYING COPYING.LIB # NOTE: there is no top-level license file for non-(L)GPL licenses; From patchwork Sat Apr 22 09:06:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1772242 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=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q3QWF2dzkz1ybF for ; Sat, 22 Apr 2023 19:06:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3EDD060E31; Sat, 22 Apr 2023 09:06:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3EDD060E31 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1LjA7rc9CIZQ; Sat, 22 Apr 2023 09:06:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 4C16F60D76; Sat, 22 Apr 2023 09:06:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 4C16F60D76 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3E5F61C29B8 for ; Sat, 22 Apr 2023 09:06:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 20D1041C3F for ; Sat, 22 Apr 2023 09:06:31 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 20D1041C3F X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 75dTEg7sOiUM for ; Sat, 22 Apr 2023 09:06:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9294841D61 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by smtp4.osuosl.org (Postfix) with ESMTPS id 9294841D61 for ; Sat, 22 Apr 2023 09:06:29 +0000 (UTC) X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.209.208]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N1Obh-1qHp4T17O7-012pOs; Sat, 22 Apr 2023 11:06:26 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Sat, 22 Apr 2023 11:06:24 +0200 Message-Id: <20230422090625.25006-2-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230422090625.25006-1-ps.report@gmx.net> References: <20230422090625.25006-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:+GRI6+lN4037xgDJb7HnMKFlXWWq18ceg8Z2gmyQYXpb3XM4xyO 0KZmih1pcs6LdTTXkDckWxY1M6TokixLBn9vJLWyWq8c0iSr8085J80Qd9sWW1rRaJfLQvQ XZ3DaGiCWXntb3E9FLjrziDYG3om9uSVxGXjVMlU0FpfZ0AT64p1FOqpD2poACVW3niNjZs n3A/4/zLCFgOTRIw+Ib9g== UI-OutboundReport: notjunk:1;M01:P0:Pz3C3NPL7Uw=;nUoV0PoZRgb4Pj/Ba7WH7izWW2H qDCqOq/3tgiNYGxBKFoPLBa0QGwEUt9pHCNMqrUkbMs+4kfkpZH/G2M65tisUeuXi10JFo3pJ Gko+cIMEFCjbDK9YcLrjtiuyoErxZRuFLskuk2UdskKkS6z9jPxjd83+Ix/ewN4kXHy6WB7+Z B6AceSBuxcn2tiNuHUqZgXT6aehwZ/uKQn5o1XcZ6Fr45fAA6MxRSshHGeRn30Fz0/bKDcgra hG1U7l7GfB38Wzuah3ae+EFBRyUBLOr0JpsHDvJV9PqZxGmeP+gDi9/FY0FeJ82Z/X0EWNV6X eiPxaCGvq0QFwVsTZaTPSdDNn0lrgaRrexQ8DKglSjlecLSidCPdW+g6gABLMI4K6CKNINHVD y7Ei/knw8jh19PzE0N5uwSNAcR8fLAfB+iC93RnsITWuDSrkb39E4l5ddkNpCEqvxkxN3nbL3 o0m02/lERHACzNfuuw7vy40weYwdeh3pYUalB6m09vdvDlgF3vxrAoETbdLkml3qfn9ZqJxdf ZzjuesnBub8D7xMrD6T+DMKBikiG+uDqHYfaljIVubTWONILReCabMNOf4d3wRrQmVG13kxa9 0SJ3cMd90EvxVS3hijtMpRuWgvGFXAIp4vearr9SdoM1ndfUykseNhr6VJbZAuPFzRzis542d 94lpY1RxhRTCnTjAFUA2BJWfRYZTHczezTeiK2oIZJvGTsJYkogU+fWZfDfVtokzi2XSiuy53 hOMxlEdyvI6aHKf0//wRdJ55/a0DkN09f7MgpeLLfUQ0u2/CccPKtqWxIYbbqD39eRfcvv9he doidRseoY5+3g3ujLgd+FvanrfP5w053GoThZ2XBuhQji7Fns7FgR+Jusvsx9saFoyQL7hNcC fs8ksWgrNquT4q1GzyFifLri/dis/KVbjx8emu2/ayWX+rnyI8YTh63DrQvyDV7eThVEGIM+V 9zY/TCRUmrHnRXdukuBl7ZrOWj0= X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1682154386; i=ps.report@gmx.net; bh=5VrHiqu2rhGIXpRQYWeXvO0BXgiB/p5dE1BTUCWkU4E=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=koq92gbM1OJeZykt+6oAEeXipxsiFrD7t4DK5hqain9ktWsmkv4aJ5xfxWjyi8ejF 92hQZ+OucC5XrQa9fUrR7FeeivkNYE0iTvVmAwFEtReGDd/LMItV5D+tCbzkfc6GOc CmHc7gGjU834Oc7G9k8joMAP7iwJYh2ugrz0wlLr3FmiDeR4MkgtHUIbK/vtkBL5S4 VPp27bWiWF1vp4ZTRBxQ22Iiyq3C8uJPPL3UyIZHCfSywKJJTb5zx3zmQhrt0cRCFQ yW5UJO8dH9HuftGmDA8RuK8bx9hWZrk8cwM72vqM/qk5ki/rTusY0niadHs9XfdWKB ZjZmLBlLR/juQ== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.a=rsa-sha256 header.s=s31663417 header.b=koq92gbM Subject: [Buildroot] [PATCH v1 2/3] package/qemu: bump version to 7.2.1 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" - remove 0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch (from upstream, see [1]) [1] https://gitlab.com/qemu-project/qemu/-/commit/e34f86a2f91c39d610d58baa6f4c9ed9a5a5d791 Signed-off-by: Peter Seiderer --- ...k-restore-of-env-flags-from-tb-flags.patch | 36 ------------------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 3 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch diff --git a/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch b/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch deleted file mode 100644 index 8dc2dd8823..0000000000 --- a/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bc2331635ce18ff068d2bb1e493bc546e1f786e1 Mon Sep 17 00:00:00 2001 -From: Guenter Roeck -Date: Mon, 12 Dec 2022 09:03:17 -0600 -Subject: [PATCH] target/sh4: Mask restore of env->flags from tb->flags - -The values in env->flags are a subset of tb->flags. -Restore only the bits that belong. - -Cc: qemu-stable@nongnu.org -Fixes: ab419fd8a035 ("target/sh4: Fix TB_FLAG_UNALIGN") -Signed-off-by: Guenter Roeck -Message-ID: <20221212011345.GA2235238@roeck-us.net> -[rth: Reduce to only the the superh_cpu_synchronize_from_tb change] -Signed-off-by: Richard Henderson -[yann.morin.1998@free.fr: backport from upstream] -Signed-off-by: Yann E. MORIN ---- - target/sh4/cpu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c -index 951eb6b9c8..f0934b20fa 100644 ---- a/target/sh4/cpu.c -+++ b/target/sh4/cpu.c -@@ -47,7 +47,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, - SuperHCPU *cpu = SUPERH_CPU(cs); - - cpu->env.pc = tb_pc(tb); -- cpu->env.flags = tb->flags; -+ cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK; - } - - static void superh_restore_state_to_opc(CPUState *cs, --- -2.25.1 - diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index e671e1d184..93f7c98f1c 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157 qemu-7.2.0.tar.xz +sha256 8c85699acf9d7a43a5fe29a64cdd56370b0c2d1ad074baf7098a824d17aad73b qemu-7.2.1.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 3f51cb572b..12d52f61bf 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 = 7.2.0 +QEMU_VERSION = 7.2.1 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = https://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c From patchwork Sat Apr 22 09:06:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1772244 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=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q3QWT5rmHz1ybF for ; Sat, 22 Apr 2023 19:07:01 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 12F0760C00; Sat, 22 Apr 2023 09:07:00 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 12F0760C00 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rjfMSIk4Vfl1; Sat, 22 Apr 2023 09:06:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 157B460D76; Sat, 22 Apr 2023 09:06:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 157B460D76 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 53DE31C2B8D for ; Sat, 22 Apr 2023 09:06:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 27E1860C00 for ; Sat, 22 Apr 2023 09:06:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 27E1860C00 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nP4BCA3Rs1nY for ; Sat, 22 Apr 2023 09:06:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 7F4DB60B2D Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by smtp3.osuosl.org (Postfix) with ESMTPS id 7F4DB60B2D for ; Sat, 22 Apr 2023 09:06:30 +0000 (UTC) X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.209.208]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M8ygO-1pv7H21vwk-00675D; Sat, 22 Apr 2023 11:06:26 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Sat, 22 Apr 2023 11:06:25 +0200 Message-Id: <20230422090625.25006-3-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230422090625.25006-1-ps.report@gmx.net> References: <20230422090625.25006-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:DC+15dtD+zbk4Z5oKd01/lFnKoqTcas9bc1fTa1zjXC311dID/q yPPwSud+ubAYETP6AMCZXMerYNXpCa8KHw9qrdWiIxTWPUH701LU0Cr2zcF8iizYQpxbS0d CMeDGrKxaX2ECtB6W1dAVX3U+akWVQovd6h127bZZ4GOYVHzOmCoWedp+ABfgZ9/ygiNmjn jD607DpV+ZsAv485qr7dA== UI-OutboundReport: notjunk:1;M01:P0:KsLUZan0YGI=;8Lj7RRbNHmLDGPasHYMhTCpR9/8 rHzayUePPcvZ4NekUr99Gmn/Cf32bfCD8RofIdqjWUW261H6/eeQ7Dd9JWXGjaSqfg56xqMRA ZVUTSK5rvKxqqhWcdB9YjVYm5CN4J7ByHvQbEkRYvoG0iwl+vwRSHEa7kV9VsNDhry1VvYuA5 fCiQhL/5etEx/fV0pyDBg6EIckdmEf0el8NoDAu774SYrBkAevpQyckafG8Kr2lpasMpGRGXp KWs4ia/Uzm/Ic0vGRY7uFDXUWjqKNmGN39v52Hck8HQkkc/i6TyGYGSfy7pVvWlonGxvozBmX sed095/t5L4QzjqdQyjRLX5cCxilQ3l2wYJR9r8/X0E0z4YbYj5RdVqEi5AcJPp87BkQDkI9x CbfINS9fO3ghhf1PtI02j5Aw/9Je98/Jaf0dY7TpplQYd7ANQKS/4jUR3+juvXMe2jPJeypH4 Eh4ykfMfsIA264UMWYwFp1EHorYR5lA9im0vgGAXpJrvYxJBquO+DzTDBoYUNsa9pE9EhnqGf D6h4la1TtKg4OgcqtK7OfaKgA0HlzOVU5NBns+m16jR8S7Rst7fYFzSH4eAmo5nfpINMXSKib NkpPXW/FRvhSaX7xG/ZRd5QzzeGEQ8nlYDoWDE4RCmA3EUKlhrCjuybQx1VNGvtRHo2Gpxdy0 OuWcVsQVfgJrgGHgDgK8JNMxi+QiQzrFg2BnvadGGdVvbSOFd7gMfttEPfKu3FQz9cru2LkbF S/x79THoGynp1n8pbum7j3QgEcMyYwd4BiPPIZPfAs+rG1px1UW7M6QMtXV9R2a0FUuFf4kJQ qzH0tBIePQU0/E9++JVdNi7Ru2JAZO8dZnnDaO+YX8o3a2irlLR65CvunCc+17SYE7/X8oXx9 4JroDAEq+SaAs3DPZb/+x/uCVqrXfbxPC7WrYXpfzjWn8jYmylwKoNlNH+FylOZ1Tu4qSgRwX gP2Cnpk52LqGkdMfCmWx+J5Pgg8= X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1682154386; i=ps.report@gmx.net; bh=4zkCh/PYmtmk0dwSlXK4D6mU5eVdBDSZkVQhrE0RCXI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=XnfUJik99kLNFHjF1Q6uE0FXU2GWgnwe74OwPS1EHUpwhxD+ZYmlU+DEvPXX4MtDU R6VxBW0DcfmEZcB03VrVa/kl0JWcaFrhplg/vuIJFYySm1WzYbGi+gUAyiquzLGRej HYwKfesOXjs/gEnJaodRdIHPKW9bGNIhbDgh55ZG6tPVu+LX1szivJINPXLNwqNbTO 97i8Fc92gGkMHJy5iP24J6FYHInMFVe1oqfz6eWdoTrqkfb4/kMEeFBX8tx8r+0H1q K209fNKRuI7zXWnsp4+sMcQW7xd2nKWw45jD1csmuIBeAKj5tqn7ZXun5vOSBAvgHl Xek9G6dsjCrrA== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.a=rsa-sha256 header.s=s31663417 header.b=XnfUJik9 Subject: [Buildroot] [PATCH v1 3/3] package/qemu: add patches to fix host libc-2.37 compile 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" - add two upstream patches to fix host libc-2.37 compile (see [1], [2] for details) Fixes: In file included from /usr/include/linux/btrfs.h:29, from ../linux-user/syscall.c:163: /usr/include/linux/fs.h:50:8: error: redefinition of ‘struct file_clone_range’ 50 | struct file_clone_range { | ^~~~~~~~~~~~~~~~ ../linux-user/syscall.c:129:8: note: originally defined here 129 | struct file_clone_range { | ^~~~~~~~~~~~~~~~ [1] https://lists.openembedded.org/g/openembedded-core/message/177322 [2] https://lore.kernel.org/qemu-devel/20230110174901.2580297-1-berrange@redhat.com/ Signed-off-by: Peter Seiderer Reviewed-by: Romain Naour --- ...er-add-more-compat-ioctl-definitions.patch | 73 +++++++++++++++++ ...r-fix-compat-with-glibc-2.36-sys-mou.patch | 82 +++++++++++++++++++ 2 files changed, 155 insertions(+) create mode 100644 package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch create mode 100644 package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch diff --git a/package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch b/package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch new file mode 100644 index 0000000000..9040daea92 --- /dev/null +++ b/package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch @@ -0,0 +1,73 @@ +From ba43bb7b641a602081554d7d2a497888209fec2d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Tue, 10 Jan 2023 12:49:00 -0500 +Subject: [PATCH 3/4] Revert "linux-user: add more compat ioctl definitions" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0. + +glibc has fixed (in 2.36.9000-40-g774058d729) the problem +that caused a clash when both sys/mount.h annd linux/mount.h +are included, and backported this to the 2.36 stable release +too: + + https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +It is saner for QEMU to remove the workaround it applied for +glibc 2.36 and expect distros to ship the 2.36 maint release +with the fix. This avoids needing to add a further workaround +to QEMU to deal with the fact that linux/brtfs.h now also pulls +in linux/mount.h via linux/fs.h since Linux 6.1 + +Signed-off-by: Daniel P. Berrangé +Reviewed-by: Marc-André Lureau +Message-Id: <20230110174901.2580297-2-berrange@redhat.com> +Signed-off-by: Laurent Vivier + +[Upstream: https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a] +Signed-off-by: Peter Seiderer +--- + linux-user/syscall.c | 25 ------------------------- + 1 file changed, 25 deletions(-) + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 24b25759be..10af5e0d8e 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -111,31 +111,6 @@ + #define FS_IOC32_SETFLAGS _IOW('f', 2, int) + #define FS_IOC32_GETVERSION _IOR('v', 1, int) + #define FS_IOC32_SETVERSION _IOW('v', 2, int) +- +-#define BLKGETSIZE64 _IOR(0x12,114,size_t) +-#define BLKDISCARD _IO(0x12,119) +-#define BLKIOMIN _IO(0x12,120) +-#define BLKIOOPT _IO(0x12,121) +-#define BLKALIGNOFF _IO(0x12,122) +-#define BLKPBSZGET _IO(0x12,123) +-#define BLKDISCARDZEROES _IO(0x12,124) +-#define BLKSECDISCARD _IO(0x12,125) +-#define BLKROTATIONAL _IO(0x12,126) +-#define BLKZEROOUT _IO(0x12,127) +- +-#define FIBMAP _IO(0x00,1) +-#define FIGETBSZ _IO(0x00,2) +- +-struct file_clone_range { +- __s64 src_fd; +- __u64 src_offset; +- __u64 src_length; +- __u64 dest_offset; +-}; +- +-#define FICLONE _IOW(0x94, 9, int) +-#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range) +- + #else + #include + #endif +-- +2.40.0 + diff --git a/package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch b/package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch new file mode 100644 index 0000000000..5dbef6d6a4 --- /dev/null +++ b/package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch @@ -0,0 +1,82 @@ +From ec8b232faefcdd7482c4998e64b78d49d0204502 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Tue, 10 Jan 2023 12:49:01 -0500 +Subject: [PATCH 4/4] Revert "linux-user: fix compat with glibc >= 2.36 + sys/mount.h" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532. + +glibc has fixed (in 2.36.9000-40-g774058d729) the problem +that caused a clash when both sys/mount.h annd linux/mount.h +are included, and backported this to the 2.36 stable release +too: + + https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +It is saner for QEMU to remove the workaround it applied for +glibc 2.36 and expect distros to ship the 2.36 maint release +with the fix. This avoids needing to add a further workaround +to QEMU to deal with the fact that linux/brtfs.h now also pulls +in linux/mount.h via linux/fs.h since Linux 6.1 + +Signed-off-by: Daniel P. Berrangé +Reviewed-by: Marc-André Lureau +Message-Id: <20230110174901.2580297-3-berrange@redhat.com> +Signed-off-by: Laurent Vivier + +[Upstream: https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e] +Signed-off-by: Peter Seiderer +--- + linux-user/syscall.c | 18 ------------------ + meson.build | 2 -- + 2 files changed, 20 deletions(-) + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 10af5e0d8e..d974c76b60 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -95,25 +95,7 @@ + #include + #include + #include +- +-#ifdef HAVE_SYS_MOUNT_FSCONFIG +-/* +- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h, +- * which in turn prevents use of linux/fs.h. So we have to +- * define the constants ourselves for now. +- */ +-#define FS_IOC_GETFLAGS _IOR('f', 1, long) +-#define FS_IOC_SETFLAGS _IOW('f', 2, long) +-#define FS_IOC_GETVERSION _IOR('v', 1, long) +-#define FS_IOC_SETVERSION _IOW('v', 2, long) +-#define FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap) +-#define FS_IOC32_GETFLAGS _IOR('f', 1, int) +-#define FS_IOC32_SETFLAGS _IOW('f', 2, int) +-#define FS_IOC32_GETVERSION _IOR('v', 1, int) +-#define FS_IOC32_SETVERSION _IOW('v', 2, int) +-#else + #include +-#endif + #include + #if defined(CONFIG_FIEMAP) + #include +diff --git a/meson.build b/meson.build +index b88867ca9d..39e83bbafe 100644 +--- a/meson.build ++++ b/meson.build +@@ -2032,8 +2032,6 @@ config_host_data.set('HAVE_OPTRESET', + cc.has_header_symbol('getopt.h', 'optreset')) + config_host_data.set('HAVE_IPPROTO_MPTCP', + cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP')) +-config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG', +- cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG')) + + # has_member + config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID', +-- +2.40.0 +