summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-02-26 08:58:21 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-05 13:14:57 +0000
commitba3318e3690ff5071f846071d11d2ad8dd97b465 (patch)
tree34f5770ba6d51a3896dd44eb6b3044a15fdfebe1
parent87f8f307946391ed37cea872d1ab6f2c9d3aca15 (diff)
downloadpoky-ba3318e3690ff5071f846071d11d2ad8dd97b465.tar.gz
sysprof: upgrade to 1.2.0
(From OE-Core rev: aef171f824659b255b0ed2f6430bb757fc26f9c2) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch35
-rw-r--r--meta/recipes-kernel/sysprof/sysprof_git.bb6
2 files changed, 2 insertions, 39 deletions
diff --git a/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch b/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch
deleted file mode 100644
index 041054e6e8..0000000000
--- a/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Upstream-Status: Backport
2
3From 4708a509aa9d65ae93e9824e42ddbc6e8d42d90c Mon Sep 17 00:00:00 2001
4From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net>
5Date: Sat, 27 Aug 2011 20:04:44 +0200
6Subject: [PATCH] Fix PowerPC checks for __NR_perf_counter_open.
7MIME-Version: 1.0
8Content-Type: text/plain; charset=UTF-8
9Content-Transfer-Encoding: 8bit
10
11__ppc__ isn't defined here on Debian powerpc. Grepping through the headers
12installed in /usr/include, there are a few references to __ppc__ and
13__ppc64__, but I suspect they're for other OSs.
14
15Signed-off-by: Michel Dänzer <michel@daenzer.net>
16---
17 collector.c | 2 +-
18 1 files changed, 1 insertions(+), 1 deletions(-)
19
20diff --git a/collector.c b/collector.c
21index b28964f..fe16967 100644
22--- a/collector.c
23+++ b/collector.c
24@@ -175,7 +175,7 @@ sysprof_perf_counter_open (struct perf_counter_attr *attr,
25 #define __NR_perf_counter_open 337
26 #elif defined(__hppa__)
27 #define __NR_perf_counter_open 318
28-#elif defined(__ppc__) || defined(__ppc64__)
29+#elif defined(__powerpc__) || defined(__powerpc64__)
30 #define __NR_perf_counter_open 319
31 #elif defined(__s390__)
32 #define __NR_perf_counter_open 331
33--
341.7.6.1
35
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index 64414c0b1b..c7506fee18 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -4,13 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4 4
5DEPENDS = "gtk+ libglade" 5DEPENDS = "gtk+ libglade"
6 6
7SRCREV = "4692f85f625f4fd969cef4ab5dc47cc4655c87f9" 7SRCREV = "cd44ee6644c3641507fb53b8a2a69137f2971219"
8PR = "r2" 8PV = "1.2.0+git${SRCPV}"
9PV = "1.1.8+git${SRCPV}"
10 9
11SRC_URI = "git://git.gnome.org/sysprof;protocol=git \ 10SRC_URI = "git://git.gnome.org/sysprof;protocol=git \
12 file://define-NT_GNU_BUILD_ID.patch \ 11 file://define-NT_GNU_BUILD_ID.patch \
13 file://0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch \
14 " 12 "
15 13
16SRC_URI_append_arm = " file://rmb-arm.patch" 14SRC_URI_append_arm = " file://rmb-arm.patch"