From e75b8784e10c46544b5a86107e4b159a78cade1d Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Wed, 22 Dec 2021 11:30:02 +0800 Subject: [PATCH 1/2] spec: Update patch and changelog with !216 sync from qemu-4.1.0 add Phytium CPU models: FT-2000+ and Tengyun-S2500. Merge pull request !216 from imxcc/openEuler-20.03-LTS-Next !216 Signed-off-by: Chen Qun --- qemu.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qemu.spec b/qemu.spec index 39cbeaa..e735c68 100644 --- a/qemu.spec +++ b/qemu.spec @@ -344,6 +344,7 @@ Patch0331: fix-cve-2020-35504.patch Patch0332: fix-cve-2020-35505.patch Patch0333: virtio-balloon-apply-upstream-patch.patch Patch0334: add-Phytium-s-CPU-models-FT-2000-and-Tengyun-S2500.patch +Patch0335: add-Phytium-s-CPU-models-FT-2000-and-Tengyun-S2500.patch BuildRequires: flex BuildRequires: bison @@ -740,6 +741,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Wed Dec 22 2021 Chen Qun +- add Phytium's CPU models: FT-2000+ and Tengyun-S2500. + * Tue Dec 21 2021 imxcc - add Phytium's CPU models: FT-2000+ and Tengyun-S2500 -- Gitee From 2a677d5e8cecacabd01584d1cd33d2130507e2cc Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Wed, 22 Dec 2021 11:30:09 +0800 Subject: [PATCH 2/2] spec: Update release version with !216 increase release verison by one Signed-off-by: Chen Qun --- qemu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index e735c68..92db5de 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 63 +Release: 64 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY-SA-4.0 -- Gitee