From d98578ad4751606b5f295963559ba39605cd03b6866b5098307ce3a625dcc20d Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Thu, 22 Oct 2015 10:43:33 +0000
Subject: [PATCH] Accepting request 340334 from
 home:michel_mno:branches:devel:tools

- remove strace_ppc64le_bypass_getrandom_hang.patch
  as cause of bug boo#946928 identified in builders setup

OBS-URL: https://build.opensuse.org/request/show/340334
OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=52
---
 strace.changes                             |  6 +++++
 strace.spec                                |  4 ----
 strace_ppc64le_bypass_getrandom_hang.patch | 27 ----------------------
 3 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 strace_ppc64le_bypass_getrandom_hang.patch

diff --git a/strace.changes b/strace.changes
index 8ea7634..9af3c69 100644
--- a/strace.changes
+++ b/strace.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 22 06:06:58 UTC 2015 - normand@linux.vnet.ibm.com
+
+- remove strace_ppc64le_bypass_getrandom_hang.patch
+  as cause of bug boo#946928 identified in builders setup
+
 -------------------------------------------------------------------
 Mon Sep 28 14:20:49 UTC 2015 - normand@linux.vnet.ibm.com
 
diff --git a/strace.spec b/strace.spec
index 3eccefa..70717b2 100644
--- a/strace.spec
+++ b/strace.spec
@@ -44,7 +44,6 @@ Patch12:        0012-tests-verify-that-all-patterns-match.patch
 Patch13:        0013-aarch64-properly-decode-generic-syscalls.patch
 Patch14:        0014-stat64-v.test-add-newfstatat-syscall-support.patch
 Patch15:        0015-tests-uid-use-fchown-instead-of-chown.patch
-Patch16:        strace_ppc64le_bypass_getrandom_hang.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libacl-devel
 BuildRequires:  libaio-devel
@@ -94,9 +93,6 @@ extern uint32_t *const arm_sp_ptr;' > linux/aarch64/arch_regs.h
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%ifarch ppc64le
-%patch16 -p1
-%endif
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
diff --git a/strace_ppc64le_bypass_getrandom_hang.patch b/strace_ppc64le_bypass_getrandom_hang.patch
deleted file mode 100644
index f601c6d..0000000
--- a/strace_ppc64le_bypass_getrandom_hang.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Michel Normand <normand@linux.vnet.ibm.com>
-Subject: strace ppc64le bypass getrandom hang
-Date: Mon, 28 Sep 2015 16:19:53 +0200
-
-strace ppc64le bypass getrandom hang as per bug boo#946928
-
-Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
----
- tests/getrandom.test |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: strace-4.10/tests/getrandom.test
-===================================================================
---- strace-4.10.orig/tests/getrandom.test
-+++ strace-4.10/tests/getrandom.test
-@@ -5,8 +5,9 @@
- . "${srcdir=.}/init.sh"
- 
- check_prog awk
--
--./getrandom ||
-+# bypass hung condition that timeout after 60s as per bug boo#946928
-+# by removing the first getrandom call.
-+#/getrandom ||
- 	framework_skip_ 'getrandom is not available'
- 
- args="-e getrandom -xx -s3 ./getrandom"