From dc90ace2a48364769043187edc7a526227e705fbfbd36eaec86a4032c9fce885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 27 Jan 2016 16:31:12 +0000 Subject: [PATCH] Accepting request 356320 from home:a_faerber:branches:Virtualization Clean up configured features and fix e500 testsuite issues OBS-URL: https://build.opensuse.org/request/show/356320 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=286 --- qemu-testsuite.changes | 11 +++++++++++ qemu-testsuite.spec | 19 ++++++++++++++++++- qemu.changes | 11 +++++++++++ qemu.spec | 19 ++++++++++++++++++- qemu.spec.in | 19 ++++++++++++++++++- 5 files changed, 76 insertions(+), 3 deletions(-) diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 70a58c92..a66256cd 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jan 27 15:10:02 UTC 2016 - afaerber@suse.de + +- Don't drop u-boot.e500 yet - breaks testsuite + +------------------------------------------------------------------- +Thu Jan 21 18:02:04 UTC 2016 - afaerber@suse.de + +- Re-enable libcacard support +- Clean up configured features + ------------------------------------------------------------------- Thu Jan 21 16:07:16 UTC 2016 - afaerber@suse.de diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index 263d0281..9ca24b50 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -148,17 +148,22 @@ BuildRequires: libaio BuildRequires: libaio-devel BuildRequires: libattr-devel BuildRequires: libbz2-devel +BuildRequires: libcacard-devel BuildRequires: libcap-devel BuildRequires: libcap-ng-devel %if 0%{?suse_version} >= 1310 # 12.3 and earlier don't ship a compatible libfdt; use the bundled one there BuildRequires: libfdt1-devel %endif +BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel %if 0%{?suse_version} >= 1315 BuildRequires: libibverbs-devel %endif BuildRequires: libjpeg-devel +%if 0%{?suse_version} >= 1310 +BuildRequires: libnettle-devel +%endif %ifarch %ix86 aarch64 %if 0%{?suse_version} > 1320 BuildRequires: libnuma-devel @@ -665,14 +670,21 @@ rm -f pc-bios/slof.bin %endif --enable-bzip2 \ --enable-cap-ng \ + --enable-coroutine-pool \ --enable-curl \ --enable-curses \ --enable-fdt \ +%if 0 +# Let it auto-detect these based on gnutls - uses libnettle in Tumbleweed but unavailable in SLE11 + --enable-gcrypt \ + --disable-nettle \ +%endif %if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 --enable-glusterfs \ %else --disable-glusterfs \ %endif + --enable-gnutls \ --enable-gtk \ %if 0%{?suse_version} >= 1220 --with-gtkabi=3.0 \ @@ -729,6 +741,7 @@ rm -f pc-bios/slof.bin %else --disable-seccomp \ %endif + --enable-smartcard \ %if 0%{?suse_version} >= 1310 --enable-snappy \ %else @@ -759,6 +772,9 @@ rm -f pc-bios/slof.bin --enable-vnc-jpeg \ --enable-vnc-png \ --enable-vnc-sasl \ +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1320 + --enable-vte \ +%endif %ifarch x86_64 --enable-xen \ --enable-xen-pci-passthrough \ @@ -859,7 +875,7 @@ for f in acpi-dsdt.aml q35-acpi-dsdt.aml bios-256k.bin bios.bin efi-*.rom pxe-*. rm $RPM_BUILD_ROOT/%_datadir/%name/$f done %endif -rm -f %{buildroot}%{_datadir}/%{name}/u-boot.e500 +# rm -f %{buildroot}%{_datadir}/%{name}/u-boot.e500 install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf %find_lang %name %if %{legacy_qemu_kvm} @@ -1003,6 +1019,7 @@ fi %_datadir/%name/openbios-ppc %_datadir/%name/slof.bin %_datadir/%name/spapr-rtas.bin +%_datadir/%name/u-boot.e500 %_datadir/%name/bamboo.dtb %_datadir/%name/petalogix-ml605.dtb diff --git a/qemu.changes b/qemu.changes index 70a58c92..a66256cd 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jan 27 15:10:02 UTC 2016 - afaerber@suse.de + +- Don't drop u-boot.e500 yet - breaks testsuite + +------------------------------------------------------------------- +Thu Jan 21 18:02:04 UTC 2016 - afaerber@suse.de + +- Re-enable libcacard support +- Clean up configured features + ------------------------------------------------------------------- Thu Jan 21 16:07:16 UTC 2016 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index cb0fdd43..b3902746 100644 --- a/qemu.spec +++ b/qemu.spec @@ -148,17 +148,22 @@ BuildRequires: libaio BuildRequires: libaio-devel BuildRequires: libattr-devel BuildRequires: libbz2-devel +BuildRequires: libcacard-devel BuildRequires: libcap-devel BuildRequires: libcap-ng-devel %if 0%{?suse_version} >= 1310 # 12.3 and earlier don't ship a compatible libfdt; use the bundled one there BuildRequires: libfdt1-devel %endif +BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel %if 0%{?suse_version} >= 1315 BuildRequires: libibverbs-devel %endif BuildRequires: libjpeg-devel +%if 0%{?suse_version} >= 1310 +BuildRequires: libnettle-devel +%endif %ifarch %ix86 aarch64 %if 0%{?suse_version} > 1320 BuildRequires: libnuma-devel @@ -665,14 +670,21 @@ rm -f pc-bios/slof.bin %endif --enable-bzip2 \ --enable-cap-ng \ + --enable-coroutine-pool \ --enable-curl \ --enable-curses \ --enable-fdt \ +%if 0 +# Let it auto-detect these based on gnutls - uses libnettle in Tumbleweed but unavailable in SLE11 + --enable-gcrypt \ + --disable-nettle \ +%endif %if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 --enable-glusterfs \ %else --disable-glusterfs \ %endif + --enable-gnutls \ --enable-gtk \ %if 0%{?suse_version} >= 1220 --with-gtkabi=3.0 \ @@ -729,6 +741,7 @@ rm -f pc-bios/slof.bin %else --disable-seccomp \ %endif + --enable-smartcard \ %if 0%{?suse_version} >= 1310 --enable-snappy \ %else @@ -759,6 +772,9 @@ rm -f pc-bios/slof.bin --enable-vnc-jpeg \ --enable-vnc-png \ --enable-vnc-sasl \ +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1320 + --enable-vte \ +%endif %ifarch x86_64 --enable-xen \ --enable-xen-pci-passthrough \ @@ -859,7 +875,7 @@ for f in acpi-dsdt.aml q35-acpi-dsdt.aml bios-256k.bin bios.bin efi-*.rom pxe-*. rm $RPM_BUILD_ROOT/%_datadir/%name/$f done %endif -rm -f %{buildroot}%{_datadir}/%{name}/u-boot.e500 +# rm -f %{buildroot}%{_datadir}/%{name}/u-boot.e500 install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf %find_lang %name %if %{legacy_qemu_kvm} @@ -1003,6 +1019,7 @@ fi %_datadir/%name/openbios-ppc %_datadir/%name/slof.bin %_datadir/%name/spapr-rtas.bin +%_datadir/%name/u-boot.e500 %_datadir/%name/bamboo.dtb %_datadir/%name/petalogix-ml605.dtb diff --git a/qemu.spec.in b/qemu.spec.in index 9bbc51a5..7a5e1ef8 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -111,17 +111,22 @@ BuildRequires: libaio BuildRequires: libaio-devel BuildRequires: libattr-devel BuildRequires: libbz2-devel +BuildRequires: libcacard-devel BuildRequires: libcap-devel BuildRequires: libcap-ng-devel %if 0%{?suse_version} >= 1310 # 12.3 and earlier don't ship a compatible libfdt; use the bundled one there BuildRequires: libfdt1-devel %endif +BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel %if 0%{?suse_version} >= 1315 BuildRequires: libibverbs-devel %endif BuildRequires: libjpeg-devel +%if 0%{?suse_version} >= 1310 +BuildRequires: libnettle-devel +%endif %ifarch %ix86 aarch64 %if 0%{?suse_version} > 1320 BuildRequires: libnuma-devel @@ -591,14 +596,21 @@ rm -f pc-bios/slof.bin %endif --enable-bzip2 \ --enable-cap-ng \ + --enable-coroutine-pool \ --enable-curl \ --enable-curses \ --enable-fdt \ +%if 0 +# Let it auto-detect these based on gnutls - uses libnettle in Tumbleweed but unavailable in SLE11 + --enable-gcrypt \ + --disable-nettle \ +%endif %if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 --enable-glusterfs \ %else --disable-glusterfs \ %endif + --enable-gnutls \ --enable-gtk \ %if 0%{?suse_version} >= 1220 --with-gtkabi=3.0 \ @@ -655,6 +667,7 @@ rm -f pc-bios/slof.bin %else --disable-seccomp \ %endif + --enable-smartcard \ %if 0%{?suse_version} >= 1310 --enable-snappy \ %else @@ -685,6 +698,9 @@ rm -f pc-bios/slof.bin --enable-vnc-jpeg \ --enable-vnc-png \ --enable-vnc-sasl \ +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1320 + --enable-vte \ +%endif %ifarch x86_64 --enable-xen \ --enable-xen-pci-passthrough \ @@ -785,7 +801,7 @@ for f in acpi-dsdt.aml q35-acpi-dsdt.aml bios-256k.bin bios.bin efi-*.rom pxe-*. rm $RPM_BUILD_ROOT/%_datadir/%name/$f done %endif -rm -f %{buildroot}%{_datadir}/%{name}/u-boot.e500 +# rm -f %{buildroot}%{_datadir}/%{name}/u-boot.e500 install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf %find_lang %name %if %{legacy_qemu_kvm} @@ -930,6 +946,7 @@ fi %_datadir/%name/openbios-ppc %_datadir/%name/slof.bin %_datadir/%name/spapr-rtas.bin +%_datadir/%name/u-boot.e500 %_datadir/%name/bamboo.dtb %_datadir/%name/petalogix-ml605.dtb