summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-10-15 15:58:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-17 14:10:44 +0100
commit576c8d181b8d702d4d6e754b3832dc2c34123257 (patch)
treee5fe1d45386716ab8054f1129acd4f0a832068c0
parent4e8bc574807245fdf7778bb28dce31616003949b (diff)
downloadpoky-576c8d181b8d702d4d6e754b3832dc2c34123257.tar.gz
sysprof: remove duplicated patch
Apparently this pactch was duplicated by backported patch, and needed to be applied more broaded than to just ppc. (From OE-Core rev: 182e4768b651e58de5b42f9fb55ae9816b57233b) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch13
-rw-r--r--meta/recipes-kernel/sysprof/sysprof_git.bb1
2 files changed, 0 insertions, 14 deletions
diff --git a/meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch b/meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch
deleted file mode 100644
index a2e015a0c5..0000000000
--- a/meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: git/collector.c
2===================================================================
3--- git.orig/collector.c 2010-12-09 19:42:12.292040001 -0600
4+++ git/collector.c 2010-12-09 19:42:23.352039997 -0600
5@@ -175,7 +175,7 @@
6 #define __NR_perf_counter_open 337
7 #elif defined(__hppa__)
8 #define __NR_perf_counter_open 318
9-#elif defined(__ppc__) || defined(__ppc64__)
10+#elif defined(__powerpc__) || defined(__powerpc64__)
11 #define __NR_perf_counter_open 319
12 #elif defined(__s390__)
13 #define __NR_perf_counter_open 331
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index c55326352b..bd34f005d2 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://git.gnome.org/sysprof;protocol=git \
15 15
16SRC_URI_append_arm = " file://rmb-arm.patch" 16SRC_URI_append_arm = " file://rmb-arm.patch"
17SRC_URI_append_mips = " file://rmb-mips.patch" 17SRC_URI_append_mips = " file://rmb-mips.patch"
18SRC_URI_append_powerpc = " file://ppc-macro-fix.patch"
19 18
20S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
21 20