rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 229396 from home:a_faerber:branches:Virtualization

Browse Source 
Various -rc1 cleanups: ksm.service permissions, duplicate qom-test, qemu-lang for 11.4, qemu-ifup for SLE11 SP3 ppc64, qemu-kvm for s390x

OBS-URL: https://build.opensuse.org/request/show/229396
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=201
This commit is contained in:
Andreas Färber 2014-04-08 15:25:09 +00:00 committed by Git OBS Bridge
parent 678bd2896d
commit 94a969fed6
5 changed files with 86 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0038-tests-Don-t-run-qom-test-twice.patch Normal file
View File

@ -0,0 +1,35 @@
From a8a1dce006b71a339db445b828f18e2f9690fc3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Mon, 7 Apr 2014 16:03:08 +0200
Subject: [PATCH] tests: Don't run qom-test twice
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Commit 3687d5325 accidentally resulted in running qom-test twice
for x86_64, once directly via the wildcard, and once because x86_64
includes all the i386 qtests (which includes qom-test).
Filter out x86_64 as well as microblazeel and xtensaeb to fix this.
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
tests/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile b/tests/Makefile
index 6086f68..b6470c8 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -162,7 +162,9 @@ check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)
# qom-test works for all sysemu architectures:
-$(foreach target,$(SYSEMU_TARGET_LIST), \
+QTEST_SYSEMU_TARGET_LIST=$(filter-out x86_64 microblazeel xtensaeb, \
+ $(SYSEMU_TARGET_LIST))
+$(foreach target,$(QTEST_SYSEMU_TARGET_LIST), \
$(eval check-qtest-$(target)-y += tests/qom-test$(EXESUF)))
check-qapi-schema-y := $(addprefix tests/qapi-schema/, \

2
qemu-linux-user.spec
View File

@ -62,6 +62,7 @@ Patch0034: 0034-linux-user-lseek-explicitly-cast-no.patch
Patch0035: 0035-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0037: 0037-xen_disk-add-discard-support.patch
Patch0038: 0038-tests-Don-t-run-qom-test-twice.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: rpmlintrc
@ -152,6 +153,7 @@ run cross-architecture builds.
%patch0035 -p1
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

11
qemu.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Apr 4 00:17:38 UTC 2014 - afaerber@suse.de
- Fix qemu-kvm script for s390x (bnc#869021) (bfrogers)
- Fix ksm.service file permissions to not be executable w/o shebang
- Re-enable Gtk build on 11.4 (fixes unpackaged qemu.mo files error)
- Fix SLE11 SP3 build by making sub-package "noarch" conditional
* Do not exclude qemu-ifup from qemu package when not installing
- Speed up %check by not running qom-test twice for some targets
0038-tests-Don-t-run-qom-test-twice.patch
-------------------------------------------------------------------
Thu Apr 3 15:59:32 UTC 2014 - afaerber@suse.de

31
qemu.spec
View File

@ -18,10 +18,15 @@
%ifarch %ix86 x86_64
# choice of building all from source or using provided binary x86 blobs
%if 0%{?suse_version} >= 1140
%define build_x86_fw_from_source 1
%else
%define build_x86_fw_from_source 0
%endif
%else
%define build_x86_fw_from_source 0
%endif
%define noarch_supported 1110
Name: qemu
Url: http://www.qemu.org/
@ -75,6 +80,7 @@ Patch0034: 0034-linux-user-lseek-explicitly-cast-no.patch
Patch0035: 0035-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0037: 0037-xen_disk-add-discard-support.patch
Patch0038: 0038-tests-Don-t-run-qom-test-twice.patch
# Please do not add patches manually here, run update_git.sh.
# roms/ipxe patches
@ -193,9 +199,9 @@ Recommends: qemu-arm
Suggests: qemu-arm
%endif
Suggests: qemu-extra
Suggests: qemu-lang
%if 0%{?suse_version} >= 1210
Recommends: qemu-ksm = %{version}
Suggests: qemu-lang
%endif
%define built_firmware_files {acpi-dsdt.aml bios.bin bios-256k.bin \
@ -309,7 +315,6 @@ not required for KVM usage, but rather facilitates its usage with tools
derived from the legacy kvm package.
%endif
%if 0%{?suse_version} >= 1210
%package lang
Summary: Universal CPU emulator -- Translations
Group: System/Emulators/PC
@ -322,7 +327,6 @@ system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
as PC and PowerMac systems.
This sub-package contains translations.
%endif
%package tools
Summary: Universal CPU emulator -- Tools
@ -388,7 +392,9 @@ Summary: X86 BIOS for QEMU
Group: System/Emulators/PC
Version: 1.7.4
Release: 0
%if 0%{?suse_version} > %{noarch_supported}
BuildArch: noarch
%endif
Conflicts: qemu < 1.6.0
%description seabios
@ -400,7 +406,9 @@ Summary: VGA BIOSes for QEMU
Group: System/Emulators/PC
Version: 1.7.4
Release: 0
%if 0%{?suse_version} > %{noarch_supported}
BuildArch: noarch
%endif
Conflicts: qemu < 1.6.0
%description vgabios
@ -413,7 +421,9 @@ Summary: Serial Graphics Adapter BIOS for QEMU
Group: System/Emulators/PC
Version: 8
Release: 0
%if 0%{?suse_version} > %{noarch_supported}
BuildArch: noarch
%endif
Conflicts: qemu < 1.6.0
%description sgabios
@ -426,7 +436,9 @@ Summary: PXE ROMs for QEMU NICs
Group: System/Emulators/PC
Version: 1.0.0
Release: 0
%if 0%{?suse_version} > %{noarch_supported}
BuildArch: noarch
%endif
Conflicts: qemu < 1.6.0
%description ipxe
@ -484,6 +496,7 @@ This package provides a service file for starting and stopping KSM.
%patch0035 -p1
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch1000 -p1
%patch1001 -p1
@ -515,11 +528,9 @@ done
--enable-cap-ng \
--enable-curl \
--enable-curses \
%if 0%{?suse_version} >= 1210
--enable-gtk \
%if 0%{?suse_version} >= 1220
--with-gtkabi=3.0 \
%endif
%endif
--enable-linux-aio \
--enable-modules \
@ -570,14 +581,12 @@ make check V=1
make install DESTDIR=$RPM_BUILD_ROOT
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%if 0%{?suse_version} >= 1210
%find_lang %name
%endif
%ifarch %ix86 x86_64 s390x
cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF'
#!/bin/sh
%ifarch %s390x
%ifarch s390x
exec %{_bindir}/qemu-system-s390x -machine accel=kvm "$@"
%else
exec %{_bindir}/qemu-system-x86_64 -machine accel=kvm "$@"
@ -595,7 +604,7 @@ install -D -m 755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup
install -D -m 755 %{SOURCE3} %{buildroot}%{_bindir}/kvm_stat
install -D -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1/qemu-kvm.1.gz
%endif
install -D -p -m 0744 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
%fdupes -s $RPM_BUILD_ROOT
%clean
@ -688,7 +697,9 @@ fi
%exclude %_datadir/%name/petalogix-s3adsp1800.dtb
%exclude %_datadir/%name/QEMU,cgthree.bin
%exclude %_datadir/%name/QEMU,tcx.bin
%ifarch %ix86 x86_64 s390x
%exclude %_datadir/%name/qemu-ifup
%endif
%dir %_sysconfdir/%name
%ifarch %ix86 x86_64
%if 0%{?suse_version} >= 1230
@ -753,10 +764,8 @@ fi
%_mandir/man1/qemu-kvm.1.gz
%endif
%if 0%{?suse_version} >= 1210
%files lang -f %name.lang
%defattr(-, root, root)
%endif
%files seabios
%defattr(-, root, root)

29
qemu.spec.in
View File

@ -18,10 +18,15 @@
%ifarch %ix86 x86_64
# choice of building all from source or using provided binary x86 blobs
%if 0%{?suse_version} >= 1140
%define build_x86_fw_from_source 1
%else
%define build_x86_fw_from_source 0
%endif
%else
%define build_x86_fw_from_source 0
%endif
%define noarch_supported 1110
Name: qemu
Url: http://www.qemu.org/
@ -157,9 +162,9 @@ Recommends: qemu-arm
Suggests: qemu-arm
%endif
Suggests: qemu-extra
Suggests: qemu-lang
%if 0%{?suse_version} >= 1210
Recommends: qemu-ksm = %{version}
Suggests: qemu-lang
%endif
%define built_firmware_files {acpi-dsdt.aml bios.bin bios-256k.bin \
@ -273,7 +278,6 @@ not required for KVM usage, but rather facilitates its usage with tools
derived from the legacy kvm package.
%endif
%if 0%{?suse_version} >= 1210
%package lang
Summary: Universal CPU emulator -- Translations
Group: System/Emulators/PC
@ -286,7 +290,6 @@ system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
as PC and PowerMac systems.
This sub-package contains translations.
%endif
%package tools
Summary: Universal CPU emulator -- Tools
@ -352,7 +355,9 @@ Summary: X86 BIOS for QEMU
Group: System/Emulators/PC
SEABIOS_VERSION
Release: 0
%if 0%{?suse_version} > %{noarch_supported}
BuildArch: noarch
%endif
Conflicts: qemu < 1.6.0
%description seabios
@ -364,7 +369,9 @@ Summary: VGA BIOSes for QEMU
Group: System/Emulators/PC
SEABIOS_VERSION
Release: 0
%if 0%{?suse_version} > %{noarch_supported}
BuildArch: noarch
%endif
Conflicts: qemu < 1.6.0
%description vgabios
@ -377,7 +384,9 @@ Summary: Serial Graphics Adapter BIOS for QEMU
Group: System/Emulators/PC
Version: 8
Release: 0
%if 0%{?suse_version} > %{noarch_supported}
BuildArch: noarch
%endif
Conflicts: qemu < 1.6.0
%description sgabios
@ -390,7 +399,9 @@ Summary: PXE ROMs for QEMU NICs
Group: System/Emulators/PC
Version: 1.0.0
Release: 0
%if 0%{?suse_version} > %{noarch_supported}
BuildArch: noarch
%endif
Conflicts: qemu < 1.6.0
%description ipxe
@ -443,11 +454,9 @@ done
--enable-cap-ng \
--enable-curl \
--enable-curses \
%if 0%{?suse_version} >= 1210
--enable-gtk \
%if 0%{?suse_version} >= 1220
--with-gtkabi=3.0 \
%endif
%endif
--enable-linux-aio \
--enable-modules \
@ -498,14 +507,12 @@ make check V=1
make install DESTDIR=$RPM_BUILD_ROOT
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%if 0%{?suse_version} >= 1210
%find_lang %name
%endif
%ifarch %ix86 x86_64 s390x
cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF'
#!/bin/sh
%ifarch %s390x
%ifarch s390x
exec %{_bindir}/qemu-system-s390x -machine accel=kvm "$@"
%else
exec %{_bindir}/qemu-system-x86_64 -machine accel=kvm "$@"
@ -523,7 +530,7 @@ install -D -m 755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup
install -D -m 755 %{SOURCE3} %{buildroot}%{_bindir}/kvm_stat
install -D -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1/qemu-kvm.1.gz
%endif
install -D -p -m 0744 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
%fdupes -s $RPM_BUILD_ROOT
%clean
@ -616,7 +623,9 @@ fi
%exclude %_datadir/%name/petalogix-s3adsp1800.dtb
%exclude %_datadir/%name/QEMU,cgthree.bin
%exclude %_datadir/%name/QEMU,tcx.bin
%ifarch %ix86 x86_64 s390x
%exclude %_datadir/%name/qemu-ifup
%endif
%dir %_sysconfdir/%name
%ifarch %ix86 x86_64
%if 0%{?suse_version} >= 1230
@ -681,10 +690,8 @@ fi
%_mandir/man1/qemu-kvm.1.gz
%endif
%if 0%{?suse_version} >= 1210
%files lang -f %name.lang
%defattr(-, root, root)
%endif
%files seabios
%defattr(-, root, root)