From e03c5929659ce1b72da0213a2bbeb0798c145299 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 30 Jan 2017 20:29:56 +0100
Subject: [PATCH] Update to current git, drop merged patch

---
 .gitignore                                  |  1 +
 0001-Remove-duplicated-vgaoptions-700.patch | 28 ---------------------
 os-autoinst.spec                            | 12 ++++-----
 sources                                     |  2 +-
 4 files changed, 8 insertions(+), 35 deletions(-)
 delete mode 100644 0001-Remove-duplicated-vgaoptions-700.patch

diff --git a/.gitignore b/.gitignore
index f7bffd0..b283c33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /os-autoinst-3050cfaa60c3d8d3a222fcb6526ade02dc735177.tar.gz
 /os-autoinst-26171f41d6cab38e8707f2109663cb14e82a8e9a.tar.gz
 /os-autoinst-84d91e68eb2d54f4967ccedb56f85a332ffbcbf3.tar.gz
+/os-autoinst-c29555ce95f271faf19fd63965e815e70d38b3f8.tar.gz
diff --git a/0001-Remove-duplicated-vgaoptions-700.patch b/0001-Remove-duplicated-vgaoptions-700.patch
deleted file mode 100644
index 237779c..0000000
--- a/0001-Remove-duplicated-vgaoptions-700.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4fc67a069ff7807d1a22176f54863620265d065e Mon Sep 17 00:00:00 2001
-From: Santiago Zarate <santiago@zarate.net.ve>
-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 d873852..8575588 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -24,22 +24,19 @@
 %global github_owner    os-autoinst
 %global github_name     os-autoinst
 %global github_version  4.4
-%global github_commit   84d91e68eb2d54f4967ccedb56f85a332ffbcbf3
+%global github_commit   c29555ce95f271faf19fd63965e815e70d38b3f8
 # if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date     20170104
+%global github_date     20170126
 %global shortcommit     %(c=%{github_commit}; echo ${c:0:7})
 
 Name:           os-autoinst
 Version:        %{github_version}
-Release:        13%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release:        14%{?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
@@ -201,6 +198,9 @@ make check VERBOSE=1
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf
 
 %changelog
+* Mon Jan 30 2017 Adam Williamson <awilliam@redhat.com> - 4.4-14.20170126gitc29555c
+- Update to latest git, drop merged patch
+
 * Wed Jan 18 2017 Adam Williamson <awilliam@redhat.com> - 4.4-13.20170104git84d91e6
 - Backport fix for duplicated qemu vga options (broke ARM jobs)
 
diff --git a/sources b/sources
index bfa76ff..f978652 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (os-autoinst-84d91e68eb2d54f4967ccedb56f85a332ffbcbf3.tar.gz) = 3bc5de67678cc6a071097bd0d0805e335eac2e8d88684b5a89d16b967a7f59a43221d0acdb72b361091bdd78512bf799395081f481a90bb65dab685bace0d89d
+SHA512 (os-autoinst-c29555ce95f271faf19fd63965e815e70d38b3f8.tar.gz) = 763b86a709558044ecc98b6f1cb8b721c8be72afa1f7b5b183adbf2092dbd624818d291e803f9826be7d13f125483c61998070341ebeee4de0d8850230232e07