From e12bfcae701acc766922b96e82b694204c64a50638dea57132aad44d02655537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.com>
Date: Tue, 6 Mar 2012 19:33:45 +0000
Subject: [PATCH] Accepting request 108212 from
 home:a_faerber:branches:Virtualization

Fix non-SUSE code path in update_git.sh: It couldn't find the v1.0.1 tag, so add and update the upstream git repository as remote. Also remove any previous temporary git checkout first.

OBS-URL: https://build.opensuse.org/request/show/108212
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=61
---
 ...X-move-qemu-binary-lower-in-address-space-so-we-ha.patch | 3 ++-
 ...nux-user-improve-fake-proc-self-stat-making-ps-not.patch | 3 ++-
 ...nux-user-target_argv-is-placed-on-ts-bprm-argv-and.patch | 3 ++-
 ...C-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV-KV.patch | 3 ++-
 update_git.sh                                               | 6 +++++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch b/0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch
index d7f86f79..c90fe763 100644
--- a/0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch
+++ b/0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch
@@ -1,7 +1,8 @@
 From 4c1134246f3bd0af9b9b512a2094010ed12e7895 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 5 Dec 2011 23:37:52 +0100
-Subject: [PATCH] XXX move qemu binary lower in address space so we have space for guest stuff
+Subject: [PATCH] XXX move qemu binary lower in address space so we have space
+ for guest stuff
 
 ---
  x86_64.ld |    2 +-
diff --git a/0034-linux-user-improve-fake-proc-self-stat-making-ps-not.patch b/0034-linux-user-improve-fake-proc-self-stat-making-ps-not.patch
index 2d812617..a648ee4b 100644
--- a/0034-linux-user-improve-fake-proc-self-stat-making-ps-not.patch
+++ b/0034-linux-user-improve-fake-proc-self-stat-making-ps-not.patch
@@ -1,7 +1,8 @@
 From 9a72708a58d7bcbc1ba036a44cea920a238b0312 Mon Sep 17 00:00:00 2001
 From: Fabio Erculiani <lxnay@sabayon.org>
 Date: Tue, 3 Jan 2012 09:38:34 +0000
-Subject: [PATCH] linux-user: improve fake /proc/self/stat making `ps` not segfault.
+Subject: [PATCH] linux-user: improve fake /proc/self/stat making `ps` not
+ segfault.
 
 With the current fake /proc/self/stat implementation `ps` is
 segfaulting because it expects to read PID and argv[0] as first and
diff --git a/0035-linux-user-target_argv-is-placed-on-ts-bprm-argv-and.patch b/0035-linux-user-target_argv-is-placed-on-ts-bprm-argv-and.patch
index 7632bd8f..cb0776d1 100644
--- a/0035-linux-user-target_argv-is-placed-on-ts-bprm-argv-and.patch
+++ b/0035-linux-user-target_argv-is-placed-on-ts-bprm-argv-and.patch
@@ -1,7 +1,8 @@
 From e8171f6d129e129fe632721ab603f800385b0609 Mon Sep 17 00:00:00 2001
 From: Fabio Erculiani <lxnay@sabayon.org>
 Date: Tue, 3 Jan 2012 09:38:35 +0000
-Subject: [PATCH] linux-user: target_argv is placed on ts->bprm->argv and can't be freed()
+Subject: [PATCH] linux-user: target_argv is placed on ts->bprm->argv and
+ can't be freed()
 
 TaskState contains linux_bprm struct which encapsulates argv among
 other things.
diff --git a/0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV-KV.patch b/0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV-KV.patch
index e1789689..997edad4 100644
--- a/0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV-KV.patch
+++ b/0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV-KV.patch
@@ -1,7 +1,8 @@
 From 351142c287c874f959828c6360cda977306dfa47 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 10 Jan 2012 17:03:02 +0100
-Subject: [PATCH] PPC: KVM: Ignore ENABLE_PAPR to support very old HV KVM kernels
+Subject: [PATCH] PPC: KVM: Ignore ENABLE_PAPR to support very old HV KVM
+ kernels
 
 Very old kernels (3.1) didn't expose the PAPR capability yet, but still
 did work with HV KVM. Make the error a warning so we can work on them.
diff --git a/update_git.sh b/update_git.sh
index 741bc8aa..7bbe7a91 100644
--- a/update_git.sh
+++ b/update_git.sh
@@ -22,12 +22,16 @@ fi
 rm -f qemu.spec
 
 # fetch all patches
+rm -rf qemu-tmp
 if [ -d "$GIT_LOCAL_TREE" ]; then
     git clone -ls $GIT_LOCAL_TREE qemu-tmp
+    cd qemu-tmp
 else
     git clone $GIT_TREE qemu-tmp
+    cd qemu-tmp
+    git remote add upstream git://git.qemu.org/qemu.git
+    git remote update
 fi
-cd qemu-tmp
 git checkout $GIT_BRANCH 
 git format-patch -N --no-signature $GIT_UPSTREAM_TAG -o ..
 cd ..