summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc3
-rw-r--r--meta/recipes-core/tasks/task-poky-tools.bb1
-rw-r--r--meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch13
-rw-r--r--meta/recipes-kernel/sysprof/files/rmb-arm.patch18
-rw-r--r--meta/recipes-kernel/sysprof/files/rmb-mips.patch20
-rw-r--r--meta/recipes-kernel/sysprof/sysprof_git.bb22
6 files changed, 76 insertions, 1 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 7f3468d11d..58a0a3d516 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -1,5 +1,6 @@
1SRCREV_pn-aaina ??= "4b267533ce16656cba4104fc39dc12709c1bdddf" 1SRCREV_pn-aaina ??= "4b267533ce16656cba4104fc39dc12709c1bdddf"
2SRCDATE_abiword ??= "20070130" 2SRCDATE_abiword ??= "20070130"
3SRCREV_pn-blktrace ??= "1e09f6e9012826fca69fa07222b7bc53c3e629ee"
3SRCREV_pn-calibrateproto ??= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" 4SRCREV_pn-calibrateproto ??= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
4SRCREV_pn-clipboard-manager ??= "14994" 5SRCREV_pn-clipboard-manager ??= "14994"
5SRCREV_pn-clutter ??= "e957e277b8a4893ce8c99e94402036d42a8b3748" 6SRCREV_pn-clutter ??= "e957e277b8a4893ce8c99e94402036d42a8b3748"
@@ -152,6 +153,7 @@ SRCREV_pn-sat-solver = "aa799f7bae0ec055e0e527203635001bb7346dbc"
152SRCREV_pn-screenshot ??= "292" 153SRCREV_pn-screenshot ??= "292"
153SRCREV_pn-settings-daemon ??= "2059" 154SRCREV_pn-settings-daemon ??= "2059"
154SRCREV_pn-swabber-native ??= "1ffb646ffd4266afae181286e45d1b6f7965c47e" 155SRCREV_pn-swabber-native ??= "1ffb646ffd4266afae181286e45d1b6f7965c47e"
156SRCREV_pn-sysprof ??= "38a6af1f0a45e528fd2842983da71e0f23c70d6a"
155SRCREV_pn-table ??= "4b267533ce16656cba4104fc39dc12709c1bdddf" 157SRCREV_pn-table ??= "4b267533ce16656cba4104fc39dc12709c1bdddf"
156SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65" 158SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
157SRCREV_pn-trace-cmd ??= "0d252224626bd6926324f023a65f20c165232891" 159SRCREV_pn-trace-cmd ??= "0d252224626bd6926324f023a65f20c165232891"
@@ -178,5 +180,4 @@ SRCDATE_yaffs2-utils-native ??= "20071107"
178SRCDATE_yaffs2-utils ??= "20071107" 180SRCDATE_yaffs2-utils ??= "20071107"
179SRCREV_pn-zaurusd ??= "358" 181SRCREV_pn-zaurusd ??= "358"
180SRCREV_pn-zypper ??= "9eb0e248e06c8d20ad054be2439149d9ede37531" 182SRCREV_pn-zypper ??= "9eb0e248e06c8d20ad054be2439149d9ede37531"
181SRCREV_pn-blktrace ??= "1e09f6e9012826fca69fa07222b7bc53c3e629ee"
182 183
diff --git a/meta/recipes-core/tasks/task-poky-tools.bb b/meta/recipes-core/tasks/task-poky-tools.bb
index 029790c804..e507ce46dd 100644
--- a/meta/recipes-core/tasks/task-poky-tools.bb
+++ b/meta/recipes-core/tasks/task-poky-tools.bb
@@ -49,6 +49,7 @@ RRECOMMENDS_task-poky-tools-profile = "\
49 perf \ 49 perf \
50 trace-cmd \ 50 trace-cmd \
51 kernel-module-oprofile \ 51 kernel-module-oprofile \
52 sysprof \
52 " 53 "
53 54
54# exmap-console 55# exmap-console
diff --git a/meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch b/meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch
new file mode 100644
index 0000000000..a2e015a0c5
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch
@@ -0,0 +1,13 @@
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/files/rmb-arm.patch b/meta/recipes-kernel/sysprof/files/rmb-arm.patch
new file mode 100644
index 0000000000..60e7f707a3
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/rmb-arm.patch
@@ -0,0 +1,18 @@
1Index: git/util.h
2===================================================================
3--- git.orig/util.h 2010-12-07 22:41:57.156243001 -0600
4+++ git/util.h 2010-12-07 22:43:47.616243002 -0600
5@@ -37,4 +37,13 @@
6 #define cpu_relax() asm volatile("" ::: "memory");
7 #endif
8
9+#ifdef __arm__
10+/*
11+ * Use the __kuser_memory_barrier helper in the CPU helper page. See
12+ * arch/arm/kernel/entry-armv.S in the kernel source for details.
13+ */
14+#define rmb() ((void(*)(void))0xffff0fa0)()
15+#define cpu_relax() asm volatile("":::"memory")
16+#endif
17+
18 #endif
diff --git a/meta/recipes-kernel/sysprof/files/rmb-mips.patch b/meta/recipes-kernel/sysprof/files/rmb-mips.patch
new file mode 100644
index 0000000000..84f968ef00
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/rmb-mips.patch
@@ -0,0 +1,20 @@
1Index: git/util.h
2===================================================================
3--- git.orig/util.h 2010-12-08 01:22:44.486243001 -0600
4+++ git/util.h 2010-12-08 01:23:27.836243001 -0600
5@@ -37,4 +37,15 @@
6 #define cpu_relax() asm volatile("" ::: "memory");
7 #endif
8
9+#ifdef __mips__
10+#define rmb() asm volatile( \
11+ ".set mips2\n\t" \
12+ "sync\n\t" \
13+ ".set mips0" \
14+ : /* no output */ \
15+ : /* no input */ \
16+ : "memory")
17+#define cpu_relax() asm volatile("" ::: "memory")
18+#endif
19+
20 #endif
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
new file mode 100644
index 0000000000..d649c16541
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -0,0 +1,22 @@
1DESCRIPTION = "sysprof - System-wide Performance Profiler for Linux"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4
5DEPENDS = "gtk+ libglade"
6
7PR = r0
8PV = "1.1.6+git${SRCPV}"
9
10SRC_URI = "git://git.gnome.org/sysprof;protocol=git \
11 "
12
13SRC_URI_append_arm = " file://rmb-arm.patch"
14SRC_URI_append_mips = " file://rmb-mips.patch"
15SRC_URI_append_powerpc = " file://ppc-macro-fix.patch"
16
17SRC_URI[md5sum] = "80902a7b3d6f7cb83eb6b47e87538747"
18SRC_URI[sha256sum] = "1c6403278fa4f3b37a1fb9f0784e496dce1703fe84ac03b2650bf469133a0cb3"
19
20S = "${WORKDIR}/git"
21
22inherit autotools