From 99bc8f4abe42fe9358c9dff8706f17203c6ffa3e Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 22 Apr 2023 11:06:24 +0200 Subject: [PATCH] package/qemu: bump version to 7.2.1 - 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 [yann.morin.1998@free.fr: regenerate .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...k-restore-of-env-flags-from-tb-flags.patch | 36 ------------------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 4 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch diff --git a/.checkpackageignore b/.checkpackageignore index 9b72a780d3..d7a1df1a74 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1332,7 +1332,6 @@ package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch Upstre package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch Upstream package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch Upstream package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch Upstream -package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch Upstream package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch Upstream package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch Upstream package/qt5/qt5base/0001-qtbase-Fix-build-error-when-using-EGL.patch Upstream 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