diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-kernel/sysprof/sysprof_git.bb | 6 |
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 @@ -Upstream-Status: Backport - -From 4708a509aa9d65ae93e9824e42ddbc6e8d42d90c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net> -Date: Sat, 27 Aug 2011 20:04:44 +0200 -Subject: [PATCH] Fix PowerPC checks for __NR_perf_counter_open. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -__ppc__ isn't defined here on Debian powerpc. Grepping through the headers -installed in /usr/include, there are a few references to __ppc__ and -__ppc64__, but I suspect they're for other OSs. - -Signed-off-by: Michel Dänzer <michel@daenzer.net> ---- - collector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/collector.c b/collector.c -index b28964f..fe16967 100644 ---- a/collector.c -+++ b/collector.c -@@ -175,7 +175,7 @@ sysprof_perf_counter_open (struct perf_counter_attr *attr, - #define __NR_perf_counter_open 337 - #elif defined(__hppa__) - #define __NR_perf_counter_open 318 --#elif defined(__ppc__) || defined(__ppc64__) -+#elif defined(__powerpc__) || defined(__powerpc64__) - #define __NR_perf_counter_open 319 - #elif defined(__s390__) - #define __NR_perf_counter_open 331 --- -1.7.6.1 - 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" DEPENDS = "gtk+ libglade" -SRCREV = "4692f85f625f4fd969cef4ab5dc47cc4655c87f9" -PR = "r2" -PV = "1.1.8+git${SRCPV}" +SRCREV = "cd44ee6644c3641507fb53b8a2a69137f2971219" +PV = "1.2.0+git${SRCPV}" SRC_URI = "git://git.gnome.org/sysprof;protocol=git \ file://define-NT_GNU_BUILD_ID.patch \ - file://0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch \ " SRC_URI_append_arm = " file://rmb-arm.patch" |