Accepting request 337288 from home:a_faerber:branches:Virtualization

Build SLOF on ppc64 (thanks to k0da)

OBS-URL: https://build.opensuse.org/request/show/337288
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=272

0039-tests-Unique-test-path-for-string-v.patch

@@ -0,0 +1,71 @@
+From e803dc8085b04f0d78ae3443324a5e2f4650d759 Mon Sep 17 00:00:00 2001
+From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
+Date: Mon, 5 Oct 2015 12:04:20 +0100
+Subject: [PATCH] tests: Unique test path for /string-visitor/output
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Newer GLib's want unique test paths, and thus moan at dupes.
+(Seen on Fedora 23 which has glib 2.46)
+
+Uniqueify the paths.
+
+Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
+Signed-off-by: Andreas Färber <afaerber@suse.de>
+---
+ tests/test-string-output-visitor.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c
+index 101fb27..fd5e67b 100644
+--- a/tests/test-string-output-visitor.c
++++ b/tests/test-string-output-visitor.c
+@@ -248,39 +248,39 @@ int main(int argc, char **argv)
+ 
+     output_visitor_test_add("/string-visitor/output/int",
+                             &out_visitor_data, test_visitor_out_int, false);
+-    output_visitor_test_add("/string-visitor/output/int",
++    output_visitor_test_add("/string-visitor/output/int-human",
+                             &out_visitor_data, test_visitor_out_int, true);
+     output_visitor_test_add("/string-visitor/output/bool",
+                             &out_visitor_data, test_visitor_out_bool, false);
+-    output_visitor_test_add("/string-visitor/output/bool",
++    output_visitor_test_add("/string-visitor/output/bool-human",
+                             &out_visitor_data, test_visitor_out_bool, true);
+     output_visitor_test_add("/string-visitor/output/number",
+                             &out_visitor_data, test_visitor_out_number, false);
+-    output_visitor_test_add("/string-visitor/output/number",
++    output_visitor_test_add("/string-visitor/output/number-human",
+                             &out_visitor_data, test_visitor_out_number, true);
+     output_visitor_test_add("/string-visitor/output/string",
+                             &out_visitor_data, test_visitor_out_string, false);
+-    output_visitor_test_add("/string-visitor/output/string",
++    output_visitor_test_add("/string-visitor/output/string-human",
+                             &out_visitor_data, test_visitor_out_string, true);
+     output_visitor_test_add("/string-visitor/output/no-string",
+                             &out_visitor_data, test_visitor_out_no_string,
+                             false);
+-    output_visitor_test_add("/string-visitor/output/no-string",
++    output_visitor_test_add("/string-visitor/output/no-string-human",
+                             &out_visitor_data, test_visitor_out_no_string,
+                             true);
+     output_visitor_test_add("/string-visitor/output/enum",
+                             &out_visitor_data, test_visitor_out_enum, false);
+-    output_visitor_test_add("/string-visitor/output/enum",
++    output_visitor_test_add("/string-visitor/output/enum-human",
+                             &out_visitor_data, test_visitor_out_enum, true);
+     output_visitor_test_add("/string-visitor/output/enum-errors",
+                             &out_visitor_data, test_visitor_out_enum_errors,
+                             false);
+-    output_visitor_test_add("/string-visitor/output/enum-errors",
++    output_visitor_test_add("/string-visitor/output/enum-errors-human",
+                             &out_visitor_data, test_visitor_out_enum_errors,
+                             true);
+     output_visitor_test_add("/string-visitor/output/intList",
+                             &out_visitor_data, test_visitor_out_intList, false);
+-    output_visitor_test_add("/string-visitor/output/intList",
++    output_visitor_test_add("/string-visitor/output/intList-human",
+                             &out_visitor_data, test_visitor_out_intList, true);
+ 
+     g_test_run();

libcacard.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct  8 14:35:11 UTC 2015 - afaerber@suse.de
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.4
+* Patches added:
+  0039-tests-Unique-test-path-for-string-v.patch
+
 -------------------------------------------------------------------
 Thu Sep  3 16:57:33 UTC 2015 - afaerber@suse.de
 

libcacard.spec

@@ -63,6 +63,7 @@ Patch0035:      0035-qtest-Increase-socket-timeout.patch
 Patch0036:      0036-AIO-Reduce-number-of-threads-for-32.patch
 Patch0037:      0037-Revert-Revert-seccomp-tests-that-al.patch
 Patch0038:      0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
+Patch0039:      0039-tests-Unique-test-path-for-string-v.patch
 # Please do not add patches manually here, run update_git.sh.
 # this is to make lint happy
 Source300:      qemu-rpmlintrc
@@ -160,6 +161,7 @@ This sub-package contains development files for the Smartcard library.
 %patch0036 -p1
 %patch0037 -p1
 %patch0038 -p1
+%patch0039 -p1
 
 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

qemu-linux-user.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct  8 14:35:07 UTC 2015 - afaerber@suse.de
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.4
+* Patches added:
+  0039-tests-Unique-test-path-for-string-v.patch
+
 -------------------------------------------------------------------
 Thu Sep  3 16:57:29 UTC 2015 - afaerber@suse.de
 

qemu-linux-user.spec

@@ -63,6 +63,7 @@ Patch0035:      0035-qtest-Increase-socket-timeout.patch
 Patch0036:      0036-AIO-Reduce-number-of-threads-for-32.patch
 Patch0037:      0037-Revert-Revert-seccomp-tests-that-al.patch
 Patch0038:      0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
+Patch0039:      0039-tests-Unique-test-path-for-string-v.patch
 # Please do not add patches manually here, run update_git.sh.
 # this is to make lint happy
 Source300:      qemu-rpmlintrc
@@ -154,6 +155,7 @@ run cross-architecture builds.
 %patch0036 -p1
 %patch0037 -p1
 %patch0038 -p1
+%patch0039 -p1
 
 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

qemu-testsuite.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Oct  8 14:35:03 UTC 2015 - afaerber@suse.de
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.4
+* Fix qemu-testsuite for glib2-2.46.0 by assuring uniqueness of paths
+  0039-tests-Unique-test-path-for-string-v.patch
+
+-------------------------------------------------------------------
+Thu Oct  8 13:11:07 UTC 2015 - afaerber@suse.de
+
+- Build SLOF on ppc64 (thanks to k0da)
+* Simplify x86 fw logic while at it
+- No need to enable KVM for armv6hl
+- Add notice about pre_checkin.sh to update_git.sh
+
 -------------------------------------------------------------------
 Thu Sep  3 16:57:25 UTC 2015 - afaerber@suse.de
 

qemu-testsuite.spec

@@ -16,17 +16,19 @@
 #
 
 
+%define build_x86_fw_from_source 0
+%define build_slof_from_source 0
 %ifarch %ix86 x86_64
 # choice of building all from source or using provided binary x86 blobs
 %if 0%{?suse_version} >= 1310
 %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
-%ifarch %ix86 x86_64 ppc ppc64 ppc64le s390x %arm aarch64
+# TODO Extend to ppc64le (bsc#949000)
+%ifarch ppc64
+%define build_slof_from_source 1
+%endif
+%ifarch %ix86 x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
 %define kvm_available 1
 %else
 %define kvm_available 0
@@ -94,6 +96,7 @@ Patch0035:      0035-qtest-Increase-socket-timeout.patch
 Patch0036:      0036-AIO-Reduce-number-of-threads-for-32.patch
 Patch0037:      0037-Revert-Revert-seccomp-tests-that-al.patch
 Patch0038:      0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
+Patch0039:      0039-tests-Unique-test-path-for-string-v.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -610,6 +613,7 @@ This package provides a service file for starting and stopping KSM.
 %patch0036 -p1
 %patch0037 -p1
 %patch0038 -p1
+%patch0039 -p1
 
 %if %{build_x86_fw_from_source}
 pushd roms/seabios
@@ -630,6 +634,10 @@ pushd roms/ipxe
 %patch1101 -p1
 popd
 
+%if %{build_slof_from_source}
+rm -f pc-bios/slof.bin
+%endif
+
 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
 	--libdir=%_libdir \
@@ -767,6 +775,9 @@ make -C roms seavgabios
 make -C roms pxerom
 make -C roms sgabios
 %endif
+%if %{build_slof_from_source}
+make -C roms slof
+%endif
 %ifarch s390x
 cp pc-bios/s390-ccw/s390-ccw.img pc-bios/s390-ccw.img
 %endif

qemu.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Oct  8 14:35:03 UTC 2015 - afaerber@suse.de
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.4
+* Fix qemu-testsuite for glib2-2.46.0 by assuring uniqueness of paths
+  0039-tests-Unique-test-path-for-string-v.patch
+
+-------------------------------------------------------------------
+Thu Oct  8 13:11:07 UTC 2015 - afaerber@suse.de
+
+- Build SLOF on ppc64 (thanks to k0da)
+* Simplify x86 fw logic while at it
+- No need to enable KVM for armv6hl
+- Add notice about pre_checkin.sh to update_git.sh
+
 -------------------------------------------------------------------
 Thu Sep  3 16:57:25 UTC 2015 - afaerber@suse.de
 

qemu.spec

@@ -16,17 +16,19 @@
 #
 
 
+%define build_x86_fw_from_source 0
+%define build_slof_from_source 0
 %ifarch %ix86 x86_64
 # choice of building all from source or using provided binary x86 blobs
 %if 0%{?suse_version} >= 1310
 %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
-%ifarch %ix86 x86_64 ppc ppc64 ppc64le s390x %arm aarch64
+# TODO Extend to ppc64le (bsc#949000)
+%ifarch ppc64
+%define build_slof_from_source 1
+%endif
+%ifarch %ix86 x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
 %define kvm_available 1
 %else
 %define kvm_available 0
@@ -94,6 +96,7 @@ Patch0035:      0035-qtest-Increase-socket-timeout.patch
 Patch0036:      0036-AIO-Reduce-number-of-threads-for-32.patch
 Patch0037:      0037-Revert-Revert-seccomp-tests-that-al.patch
 Patch0038:      0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
+Patch0039:      0039-tests-Unique-test-path-for-string-v.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -610,6 +613,7 @@ This package provides a service file for starting and stopping KSM.
 %patch0036 -p1
 %patch0037 -p1
 %patch0038 -p1
+%patch0039 -p1
 
 %if %{build_x86_fw_from_source}
 pushd roms/seabios
@@ -630,6 +634,10 @@ pushd roms/ipxe
 %patch1101 -p1
 popd
 
+%if %{build_slof_from_source}
+rm -f pc-bios/slof.bin
+%endif
+
 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
 	--libdir=%_libdir \
@@ -767,6 +775,9 @@ make -C roms seavgabios
 make -C roms pxerom
 make -C roms sgabios
 %endif
+%if %{build_slof_from_source}
+make -C roms slof
+%endif
 %ifarch s390x
 cp pc-bios/s390-ccw/s390-ccw.img pc-bios/s390-ccw.img
 %endif

qemu.spec.in

@@ -16,17 +16,19 @@
 #
 
 
+%define build_x86_fw_from_source 0
+%define build_slof_from_source 0
 %ifarch %ix86 x86_64
 # choice of building all from source or using provided binary x86 blobs
 %if 0%{?suse_version} >= 1310
 %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
-%ifarch %ix86 x86_64 ppc ppc64 ppc64le s390x %arm aarch64
+# TODO Extend to ppc64le (bsc#949000)
+%ifarch ppc64
+%define build_slof_from_source 1
+%endif
+%ifarch %ix86 x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
 %define kvm_available 1
 %else
 %define kvm_available 0
@@ -556,6 +558,10 @@ pushd roms/ipxe
 %patch1101 -p1
 popd
 
+%if %{build_slof_from_source}
+rm -f pc-bios/slof.bin
+%endif
+
 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
 	--libdir=%_libdir \
@@ -693,6 +699,9 @@ make -C roms seavgabios
 make -C roms pxerom
 make -C roms sgabios
 %endif
+%if %{build_slof_from_source}
+make -C roms slof
+%endif
 %ifarch s390x
 cp pc-bios/s390-ccw/s390-ccw.img pc-bios/s390-ccw.img
 %endif

update_git.sh

@@ -150,3 +150,5 @@ sed -e 's|^\(Name:.*qemu\)|\1-testsuite|' < qemu.spec > qemu-testsuite.spec
 osc service localrun format_spec_file
 
 /bin/sh pre_checkin.sh -q
+
+echo "Please remember to run pre_checkin.sh after modifying qemu.changes."