From fd1bdb93eddac343255484573bb938ebd3463d46 Mon Sep 17 00:00:00 2001 From: Yan Wang Date: Fri, 11 Feb 2022 16:10:23 +0800 Subject: [PATCH 1/2] chardev/baum: disable unused brlapi disable unused brlapi. Signed-off-by: Yan Wang --- qemu.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qemu.spec b/qemu.spec index 396811d7..3f856e3f 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 6.2.0 -Release: 5 +Release: 6 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 @@ -66,7 +66,6 @@ BuildRequires: libattr-devel BuildRequires: libcurl-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: brlapi-devel BuildRequires: pixman-devel BuildRequires: libusbx-devel BuildRequires: bzip2-devel @@ -224,6 +223,7 @@ qemubuilddir="build" --disable-capstone \ --disable-smartcard \ --enable-zstd \ + --disable-brlapi \ --disable-plugins make %{?_smp_mflags} $buildldflags V=1 @@ -474,6 +474,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Fri Feb 11 2022 Yan Wang +- chardev/baum: disable unused brlapi + * Fri Feb 11 2022 imxcc - Revert "cpu: parse +/- feature to avoid failure" - Revert "cpu: add Cortex-A72 processor kvm target support" -- Gitee From 4c2875bf712e286199a3dbe7aca49ff89fdb879b Mon Sep 17 00:00:00 2001 From: Yan Wang Date: Fri, 11 Feb 2022 16:15:40 +0800 Subject: [PATCH 2/2] log: disable qemu_log function for "make check V=1" Lots of patches will use qemu_log, it will cause "make check V=1" failure. So disable qemu_log when calling "make check V=1". Signed-off-by: Yan Wang --- qemu.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 3f856e3f..b1dcce7c 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 6.2.0 -Release: 6 +Release: 7 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 @@ -331,6 +331,8 @@ for f in %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/* \ done %check +echo "#define CONFIG_DISABLE_QEMU_LOG" >> build/config-host.h +make %{?_smp_mflags} $buildldflags V=1 make check V=1 %pre @@ -474,6 +476,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Fri Feb 11 2022 Yan Wang +- log: disable qemu_log function for "make check V=1" + * Fri Feb 11 2022 Yan Wang - chardev/baum: disable unused brlapi -- Gitee