diff --git a/0001-Remove-duplicated-vgaoptions-700.patch b/0001-Remove-duplicated-vgaoptions-700.patch new file mode 100644 index 0000000..237779c --- /dev/null +++ b/0001-Remove-duplicated-vgaoptions-700.patch @@ -0,0 +1,28 @@ +From 4fc67a069ff7807d1a22176f54863620265d065e Mon Sep 17 00:00:00 2001 +From: Santiago Zarate +Date: Wed, 18 Jan 2017 09:46:54 +0100 +Subject: [PATCH] Remove duplicated @vgaoptions (#700) + +This was causing the following message from the qemu backend on xgene2.arch: + +RAMBlock "vga.vram" already registered, abort! +--- + backend/qemu.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/backend/qemu.pm b/backend/qemu.pm +index 84142b7..bdc42d5 100644 +--- a/backend/qemu.pm ++++ b/backend/qemu.pm +@@ -530,7 +530,7 @@ sub start_qemu { + die "fork failed" unless defined($pid); + if ($pid == 0) { + $SIG{__DIE__} = undef; # overwrite the default - just exit +- my @params = ("-serial", "file:serial0", "-soundhw", "ac97", @vgaoptions); ++ my @params = ("-serial", "file:serial0", "-soundhw", "ac97"); + + push(@params, "-global", "isa-fdc.driveA=") unless ($vars->{QEMU_NO_FDC_SET}); + push(@params, @vgaoptions); +-- +2.11.0 + diff --git a/os-autoinst.spec b/os-autoinst.spec index c0f891a..d873852 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -31,12 +31,15 @@ Name: os-autoinst Version: %{github_version} -Release: 12%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 13%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level test automation License: GPLv2+ Group: Development/System URL: https://os-autoinst.github.io/openQA/ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz +# https://github.com/os-autoinst/os-autoinst/commit/4fc67a069ff7807d1a22176f54863620265d065e +# Don't duplicate qemu vga options, it breaks ARM +Patch0: 0001-Remove-duplicated-vgaoptions-700.patch BuildRequires: autoconf BuildRequires: automake @@ -198,6 +201,9 @@ make check VERBOSE=1 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf %changelog +* Wed Jan 18 2017 Adam Williamson - 4.4-13.20170104git84d91e6 +- Backport fix for duplicated qemu vga options (broke ARM jobs) + * Wed Jan 04 2017 Adam Williamson - 4.4-12.20170104git84d91e6 - Update to latest git, drop merged #686 patch