summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch42
-rw-r--r--meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch32
-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/files/define-NT_GNU_BUILD_ID.patch4
-rw-r--r--meta/recipes-kernel/sysprof/files/gui-argument.patch35
-rw-r--r--meta/recipes-kernel/sysprof/files/rmb-arm.patch21
-rw-r--r--meta/recipes-kernel/sysprof/files/rmb-mips.patch22
-rw-r--r--meta/recipes-kernel/sysprof/sysprof_git.bb34
9 files changed, 163 insertions, 94 deletions
diff --git a/meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch b/meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch
new file mode 100644
index 0000000000..202f354d29
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch
@@ -0,0 +1,42 @@
1From 27df521c68e7c8b5b050dab15f40aa15fd03623a Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 4 May 2016 14:58:24 +0300
4Subject: [PATCH] Avoid building docs
5
6Upstream-Status: Inappropriate
7Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
8---
9 Makefile.am | 2 +-
10 m4/yelp.m4 | 6 ------
11 2 files changed, 1 insertion(+), 7 deletions(-)
12
13diff --git a/Makefile.am b/Makefile.am
14index b919a3f..3a3851d 100644
15--- a/Makefile.am
16+++ b/Makefile.am
17@@ -1,4 +1,4 @@
18-SUBDIRS = daemon data help lib po src tools tests
19+SUBDIRS = daemon data lib po src tools tests
20
21 EXTRA_DIST = AUTHORS tap-test COPYING.gpl-2
22
23diff --git a/m4/yelp.m4 b/m4/yelp.m4
24index 5db847f..1b6ede4 100644
25--- a/m4/yelp.m4
26+++ b/m4/yelp.m4
27@@ -27,12 +27,6 @@ AC_ARG_WITH([help-dir],
28 HELP_DIR="$with_help_dir"
29 AC_SUBST(HELP_DIR)
30
31-AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command])
32-AC_CHECK_PROG([ITSTOOL], [itstool], [itstool])
33-if test x"$ITSTOOL" = x; then
34- AC_MSG_ERROR([itstool not found])
35-fi
36-
37 AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command])
38 AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint])
39 if test x"$XMLLINT" = x; then
40--
412.1.4
42
diff --git a/meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch b/meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch
new file mode 100644
index 0000000000..608523272a
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch
@@ -0,0 +1,32 @@
1From 765d578145e31ddc9495adfab8037ade33c6a9cc Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 4 May 2016 10:59:36 +0300
4Subject: [PATCH] Disable check for polkit for UI
5
6The check is not technically required: sysprof just needs
7to be able to access system perf counters at runtime.
8
9Upstream-Status: Pending
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11---
12 configure.ac | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index 8559597..ecf93ad 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -131,8 +131,8 @@ AS_IF([test "$enable_gtk" = auto],[
20 AS_IF([test "$have_gtk" = "yes" && test "$have_polkit" = "yes"],[enable_gtk=yes],[enable_gtk=no])
21 ])
22 AS_IF([test "$enable_gtk" = "yes"],[
23- AS_IF([test "$have_gtk" = "yes" && test "$have_polkit" = "yes"],[],[
24- AC_MSG_ERROR([--enable-gtk requires gtk+-3.0 >= gtk_required_version and polkit-gobject-1])
25+ AS_IF([test "$have_gtk" = "yes"],[],[
26+ AC_MSG_ERROR([--enable-gtk requires gtk+-3.0 >= gtk_required_version])
27 ])
28 ])
29 AM_CONDITIONAL(ENABLE_GTK, test "$enable_gtk" = "yes")
30--
312.8.1
32
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
new file mode 100644
index 0000000000..92e804f98d
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch
@@ -0,0 +1,38 @@
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
new file mode 100644
index 0000000000..ac1384c9b0
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch
@@ -0,0 +1,29 @@
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/files/define-NT_GNU_BUILD_ID.patch b/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
index dcc2cbe67c..f75ddad43a 100644
--- a/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
+++ b/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
@@ -7,8 +7,8 @@ Upstream-Status: Pending
7 7
8Index: git/elfparser.h 8Index: git/elfparser.h
9=================================================================== 9===================================================================
10--- git.orig/elfparser.h 2011-07-16 18:57:41.000000000 -0700 10--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700
11+++ git/elfparser.h 2011-07-16 20:28:54.733829895 -0700 11+++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700
12@@ -17,6 +17,10 @@ 12@@ -17,6 +17,10 @@
13 */ 13 */
14 #include <glib.h> 14 #include <glib.h>
diff --git a/meta/recipes-kernel/sysprof/files/gui-argument.patch b/meta/recipes-kernel/sysprof/files/gui-argument.patch
deleted file mode 100644
index d2c053e689..0000000000
--- a/meta/recipes-kernel/sysprof/files/gui-argument.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Add the ability to explicitly enable/disable GUI support
2
3Signed-off-by: Christopher Larson <chris_larson@mentor.com>
4Upstream-Status: Pending
5
6--- git.orig/configure.ac
7+++ git/configure.ac
8@@ -62,12 +62,24 @@ KMICRO=`uname -r | cut -d"." -f 3 | cut
9 # Pkgconfig dependencies
10
11 core_dep="glib-2.0 >= 2.6.0"
12-gui_dep="gtk+-2.0 > 2.6.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0"
13
14 PKG_CHECK_MODULES(CORE_DEP, $core_dep, [], AC_MSG_ERROR([sysprof dependencies not satisfied]))
15
16-build_gui=yes
17-PKG_CHECK_MODULES(GUI_DEP, $gui_dep, [], build_gui=no)
18+gui_dep="gtk+-2.0 > 2.6.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0"
19+
20+AC_ARG_ENABLE([gui],
21+ [AS_HELP_STRING([--disable-gui],
22+ [Disable GUI functionality (requires gtk+, gdk-pixbuf, pangoft2, libglade) @<:@default=auto@:>@])],
23+ [],
24+ [enable_gui=auto])
25+
26+build_gui=no
27+AS_IF([test "x$enable_gui" != xno],
28+ [PKG_CHECK_MODULES(GUI_DEP, $gui_dep, build_gui=yes,
29+ [if test "x$enable_gui" != xauto; then
30+ AC_MSG_FAILURE(
31+ [--enable-gui was given, but gui dependencies were not satisfied])
32+ fi])])
33
34 AM_CONDITIONAL([BUILD_GUI], [test "$build_gui" = yes])
35
diff --git a/meta/recipes-kernel/sysprof/files/rmb-arm.patch b/meta/recipes-kernel/sysprof/files/rmb-arm.patch
deleted file mode 100644
index c53ac6427c..0000000000
--- a/meta/recipes-kernel/sysprof/files/rmb-arm.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1
2Upstream-Status: Pending
3
4Index: git/util.h
5===================================================================
6--- git.orig/util.h 2010-12-07 22:41:57.156243001 -0600
7+++ git/util.h 2010-12-07 22:43:47.616243002 -0600
8@@ -37,4 +37,13 @@
9 #define cpu_relax() asm volatile("" ::: "memory");
10 #endif
11
12+#ifdef __arm__
13+/*
14+ * Use the __kuser_memory_barrier helper in the CPU helper page. See
15+ * arch/arm/kernel/entry-armv.S in the kernel source for details.
16+ */
17+#define rmb() ((void(*)(void))0xffff0fa0)()
18+#define cpu_relax() asm volatile("":::"memory")
19+#endif
20+
21 #endif
diff --git a/meta/recipes-kernel/sysprof/files/rmb-mips.patch b/meta/recipes-kernel/sysprof/files/rmb-mips.patch
deleted file mode 100644
index e055b8ad8b..0000000000
--- a/meta/recipes-kernel/sysprof/files/rmb-mips.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Upstream-Status: Pending
2
3Index: git/util.h
4===================================================================
5--- git.orig/util.h 2010-12-08 01:22:44.486243001 -0600
6+++ git/util.h 2010-12-08 01:23:27.836243001 -0600
7@@ -37,4 +37,15 @@
8 #define cpu_relax() asm volatile("" ::: "memory");
9 #endif
10
11+#ifdef __mips__
12+#define rmb() asm volatile( \
13+ ".set mips2\n\t" \
14+ "sync\n\t" \
15+ ".set mips0" \
16+ : /* no output */ \
17+ : /* no input */ \
18+ : "memory")
19+#define cpu_relax() asm volatile("" ::: "memory")
20+#endif
21+
22 #endif
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index 84c6aad39e..461f414a1e 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -1,29 +1,35 @@
1SUMMARY = "System-wide Performance Profiler for Linux" 1SUMMARY = "System-wide Performance Profiler for Linux"
2LICENSE = "GPLv2" 2LICENSE = "GPLv3+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
4 file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875"
5
6inherit gnomebase gettext
4 7
5DEPENDS = "glib-2.0" 8DEPENDS = "glib-2.0"
6 9
7SRCREV = "cd44ee6644c3641507fb53b8a2a69137f2971219" 10S = "${WORKDIR}/git"
8PV = "1.2.0+git${SRCPV}" 11SRCREV = "9c6cec9b49766bf77c1713bc5a7c6d651e628068"
12PV = "3.20.0+git${SRCPV}"
9 13
10SRC_URI = "git://git.gnome.org/sysprof \ 14SRC_URI = "git://git.gnome.org/sysprof \
11 file://define-NT_GNU_BUILD_ID.patch \ 15 file://define-NT_GNU_BUILD_ID.patch \
12 file://gui-argument.patch \ 16 file://0001-Disable-check-for-polkit-for-UI.patch \
17 file://0001-Avoid-building-docs.patch \
18 file://0001-callgraph-Use-U64_TO_POINTER.patch \
19 file://0001-Forward-port-mips-arm-memory-barrier-patches.patch \
13 " 20 "
21SRC_URI[archive.md5sum] = "d56e8492033b60e247634731e7f760b9"
22SRC_URI[archive.sha256sum] = "4a338ad41bfffae87ef281f6e75c9660b3e0c6671bf5233be0c3f55a5e5b1ce5"
14 23
15SRC_URI_append_arm = " file://rmb-arm.patch" 24AUTOTOOLS_AUXDIR = "${S}/build-aux"
16SRC_URI_append_armeb = " file://rmb-arm.patch"
17SRC_URI_append_mips = " file://rmb-mips.patch"
18SRC_URI_append_mips64 = " file://rmb-mips.patch"
19SRC_URI_append_mips64n32 = " file://rmb-mips.patch"
20 25
21S = "${WORKDIR}/git" 26EXTRA_OECONF = "--enable-compile-warnings"
22 27
23inherit autotools pkgconfig 28PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
29PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
24 30
25PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK2DISTROFEATURES}', 'gui', '', d)}" 31FILES_${PN} += "${datadir}/icons/ ${libdir}"
26PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,gtk+ gdk-pixbuf pango libglade" 32FILES_${PN}-dev = "${prefix}/include"
27 33
28# We do not yet work for aarch64. 34# We do not yet work for aarch64.
29# 35#
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 15:56:24 +0000