summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-11-28 15:34:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-30 15:48:08 +0000
commit0724f409628d8c870194bfdaf632da1359889552 (patch)
treed6fd400f09f7f065cd304ce23f00012c931c34bf /meta
parent3c01e48bb4ef53a1112993dd9cfe1aa66928c0d1 (diff)
downloadpoky-0724f409628d8c870194bfdaf632da1359889552.tar.gz
sysprof: update to 3.22.2
Drop 0001-Forward-port-mips-arm-memory-barrier-patches.patch; upstream is using standard C11 facilities for this now. Drop 0001-callgraph-Use-U64_TO_POINTER.patch; it has been merged upstream. (From OE-Core rev: 9425992b59afa887fbbb1d3b3598f08757de4765) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch38
-rw-r--r--meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch29
-rw-r--r--meta/recipes-kernel/sysprof/sysprof_3.22.2.bb (renamed from meta/recipes-kernel/sysprof/sysprof_git.bb)12
3 files changed, 3 insertions, 76 deletions
diff --git a/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch b/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch
deleted file mode 100644
index 92e804f98d..0000000000
--- a/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From a2d385e504323641b1127821833c61e77301c90b Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Sat, 11 Jun 2016 22:45:37 +0300
4Subject: [PATCH] Forward port mips & arm memory barrier patches
5
6Upstream-Status: Pending
7Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
8---
9 lib/util/util.h | 15 +++++++++++++++
10 1 file changed, 15 insertions(+)
11
12diff --git a/lib/util/util.h b/lib/util/util.h
13index 591722d..0768056 100644
14--- a/lib/util/util.h
15+++ b/lib/util/util.h
16@@ -29,4 +29,19 @@
17 #define read_barrier() asm volatile("" ::: "memory")
18 #endif
19
20+#ifdef __arm__
21+/*
22+ * Use the __kuser_memory_barrier helper in the CPU helper page. See
23+ * arch/arm/kernel/entry-armv.S in the kernel source for details.
24+ */
25+#define read_barrier() ((void(*)(void))0xffff0fa0)()
26+#endif
27+
28+#ifdef __mips__
29+#define read_barrier() asm volatile(".set mips2\n\t" \
30+ "sync\n\t" \
31+ ".set mips0" ::: "memory")
32+#endif
33+
34+
35 #endif /* SP_UTIL_H */
36--
372.1.4
38
diff --git a/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch b/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch
deleted file mode 100644
index ac1384c9b0..0000000000
--- a/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 05816e6f9cd65b2624bb04de65fdf61031c7017f Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 10 Jun 2016 14:01:54 +0300
4Subject: [PATCH] callgraph: Use U64_TO_POINTER
5
6This fixes a "cast to pointer from integer of different size" on i586.
7
8Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
9Upstream-Status: Pending
10---
11 lib/sp-callgraph-view.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/lib/sp-callgraph-view.c b/lib/sp-callgraph-view.c
15index 02cc17b..58315b0 100644
16--- a/lib/sp-callgraph-view.c
17+++ b/lib/sp-callgraph-view.c
18@@ -135,7 +135,7 @@ build_functions_store (StackNode *node,
19
20 gtk_list_store_append (state->store, &iter);
21 gtk_list_store_set (state->store, &iter,
22- COLUMN_NAME, (const gchar *)node->data,
23+ COLUMN_NAME, U64_TO_POINTER(node->data),
24 COLUMN_SELF, 100.0 * size / state->profile_size,
25 COLUMN_TOTAL, 100.0 * total / state->profile_size,
26 COLUMN_POINTER, node,
27--
282.1.4
29
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_3.22.2.bb
index 8d8b626397..a1ed7c8b3b 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_3.22.2.bb
@@ -7,20 +7,14 @@ inherit gnomebase gettext systemd
7 7
8DEPENDS = "glib-2.0" 8DEPENDS = "glib-2.0"
9 9
10S = "${WORKDIR}/git" 10SRC_URI += " \
11SRCREV = "9c6cec9b49766bf77c1713bc5a7c6d651e628068"
12PV = "3.20.0+git${SRCPV}"
13
14SRC_URI = "git://git.gnome.org/sysprof \
15 file://define-NT_GNU_BUILD_ID.patch \ 11 file://define-NT_GNU_BUILD_ID.patch \
16 file://0001-configure-Add-option-to-enable-disable-polkit.patch \ 12 file://0001-configure-Add-option-to-enable-disable-polkit.patch \
17 file://0001-Disable-check-for-polkit-for-UI.patch \ 13 file://0001-Disable-check-for-polkit-for-UI.patch \
18 file://0001-Avoid-building-docs.patch \ 14 file://0001-Avoid-building-docs.patch \
19 file://0001-callgraph-Use-U64_TO_POINTER.patch \
20 file://0001-Forward-port-mips-arm-memory-barrier-patches.patch \
21 " 15 "
22SRC_URI[archive.md5sum] = "d56e8492033b60e247634731e7f760b9" 16SRC_URI[archive.md5sum] = "2634bf35f5592e5e4520ccaba87e909e"
23SRC_URI[archive.sha256sum] = "4a338ad41bfffae87ef281f6e75c9660b3e0c6671bf5233be0c3f55a5e5b1ce5" 17SRC_URI[archive.sha256sum] = "d57fb19a3e5d4ad37d5fb554dc93d9a03f332779c3bffd9c2aa8f176e85269d7"
24 18
25AUTOTOOLS_AUXDIR = "${S}/build-aux" 19AUTOTOOLS_AUXDIR = "${S}/build-aux"
26 20