From 2b81cf3d76241572c299a0a58a3d0ca022bef9a0 Mon Sep 17 00:00:00 2001
From: Shane Wang <shane.wang@intel.com>
Date: Sun, 22 Jan 2012 17:19:29 +0800
Subject: strace: upgrade to 4.6

Signed-off-by: Shane Wang <shane.wang@intel.com>
---
 .../strace/strace-4.5.20/sigmask.patch             | 23 ----------------------
 .../strace/strace-4.6/sigmask.patch                | 23 ++++++++++++++++++++++
 meta/recipes-devtools/strace/strace_4.5.20.bb      | 22 ---------------------
 meta/recipes-devtools/strace/strace_4.6.bb         | 22 +++++++++++++++++++++
 4 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 meta/recipes-devtools/strace/strace-4.5.20/sigmask.patch
 create mode 100644 meta/recipes-devtools/strace/strace-4.6/sigmask.patch
 delete mode 100644 meta/recipes-devtools/strace/strace_4.5.20.bb
 create mode 100644 meta/recipes-devtools/strace/strace_4.6.bb

diff --git a/meta/recipes-devtools/strace/strace-4.5.20/sigmask.patch b/meta/recipes-devtools/strace/strace-4.5.20/sigmask.patch
deleted file mode 100644
index 99962af48..000000000
--- a/meta/recipes-devtools/strace/strace-4.5.20/sigmask.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-sigmask is a macro which is dropped if BSD compatibility is
-not enabled. So we check if the macro does not exist then
-we define it to __sigmask
-
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: strace-4.5.20/signal.c
-===================================================================
---- strace-4.5.20.orig/signal.c	2010-02-23 13:26:16.000000000 -0800
-+++ strace-4.5.20/signal.c	2011-07-20 23:06:35.842339197 -0700
-@@ -140,6 +140,11 @@
- #endif
- #endif /* LINUX */
- 
-+#if !defined (sigmask) && defined (__sigmask)
-+/* Compute mask for signal SIG.  */
-+#define sigmask(sig)   __sigmask(sig)
-+#endif /* sigmask */
-+
- const char *const signalent0[] = {
- #include "signalent.h"
- };
diff --git a/meta/recipes-devtools/strace/strace-4.6/sigmask.patch b/meta/recipes-devtools/strace/strace-4.6/sigmask.patch
new file mode 100644
index 000000000..99962af48
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace-4.6/sigmask.patch
@@ -0,0 +1,23 @@
+sigmask is a macro which is dropped if BSD compatibility is
+not enabled. So we check if the macro does not exist then
+we define it to __sigmask
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: strace-4.5.20/signal.c
+===================================================================
+--- strace-4.5.20.orig/signal.c	2010-02-23 13:26:16.000000000 -0800
++++ strace-4.5.20/signal.c	2011-07-20 23:06:35.842339197 -0700
+@@ -140,6 +140,11 @@
+ #endif
+ #endif /* LINUX */
+ 
++#if !defined (sigmask) && defined (__sigmask)
++/* Compute mask for signal SIG.  */
++#define sigmask(sig)   __sigmask(sig)
++#endif /* sigmask */
++
+ const char *const signalent0[] = {
+ #include "signalent.h"
+ };
diff --git a/meta/recipes-devtools/strace/strace_4.5.20.bb b/meta/recipes-devtools/strace/strace_4.5.20.bb
deleted file mode 100644
index 53df06707..000000000
--- a/meta/recipes-devtools/strace/strace_4.5.20.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "strace is a system call tracing tool."
-HOMEPAGE = "http://strace.sourceforge.net"
-SECTION = "console/utils"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4535377ede62550fdeaf39f595fd550a"
-PR = "r2"
-
-PACKAGES =+ "${PN}-graph "
-FILES_${PN}-graph = "${bindir}/strace-graph"
-RDEPENDS_${PN}-graph = "perl"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
-           file://sigmask.patch \
-          "
-
-SRC_URI[md5sum] = "64dfe10d9db0c1e34030891695ffca4b"
-SRC_URI[sha256sum] = "ea8c059369eaa5ad90b246f34eab247d0ee48bfdee2670c7196320a4669ccabd"
-inherit autotools
-
-export INCLUDES = "-I. -I./linux"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/strace/strace_4.6.bb b/meta/recipes-devtools/strace/strace_4.6.bb
new file mode 100644
index 000000000..05f6d9508
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace_4.6.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "strace is a system call tracing tool."
+HOMEPAGE = "http://strace.sourceforge.net"
+SECTION = "console/utils"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4535377ede62550fdeaf39f595fd550a"
+PR = "r0"
+
+PACKAGES =+ "${PN}-graph "
+FILES_${PN}-graph = "${bindir}/strace-graph"
+RDEPENDS_${PN}-graph = "perl"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
+           file://sigmask.patch \
+          "
+
+SRC_URI[md5sum] = "e537b2b1afeec70c0e6e27a0d0fd671e"
+SRC_URI[sha256sum] = "9ef9aa41b6118578e33ef4833b8a04209d6cc062546c28efd715f283b172c28a"
+inherit autotools
+
+export INCLUDES = "-I. -I./linux"
+
+BBCLASSEXTEND = "native"
-- 
cgit v1.2.3