diff options
Diffstat (limited to 'meta/recipes-kernel/sysprof')
9 files changed, 151 insertions, 96 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 @@ +From 27df521c68e7c8b5b050dab15f40aa15fd03623a Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Wed, 4 May 2016 14:58:24 +0300 +Subject: [PATCH] Avoid building docs + +Upstream-Status: Inappropriate +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + Makefile.am | 2 +- + m4/yelp.m4 | 6 ------ + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index b919a3f..3a3851d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = daemon data help lib po src tools tests ++SUBDIRS = daemon data lib po src tools tests + + EXTRA_DIST = AUTHORS tap-test COPYING.gpl-2 + +diff --git a/m4/yelp.m4 b/m4/yelp.m4 +index 5db847f..1b6ede4 100644 +--- a/m4/yelp.m4 ++++ b/m4/yelp.m4 +@@ -27,12 +27,6 @@ AC_ARG_WITH([help-dir], + HELP_DIR="$with_help_dir" + AC_SUBST(HELP_DIR) + +-AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command]) +-AC_CHECK_PROG([ITSTOOL], [itstool], [itstool]) +-if test x"$ITSTOOL" = x; then +- AC_MSG_ERROR([itstool not found]) +-fi +- + AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command]) + AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) + if test x"$XMLLINT" = x; then +-- +2.1.4 + 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 @@ +From 765d578145e31ddc9495adfab8037ade33c6a9cc Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Wed, 4 May 2016 10:59:36 +0300 +Subject: [PATCH] Disable check for polkit for UI + +The check is not technically required: sysprof just needs +to be able to access system perf counters at runtime. + +Upstream-Status: Pending +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8559597..ecf93ad 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -131,8 +131,8 @@ AS_IF([test "$enable_gtk" = auto],[ + AS_IF([test "$have_gtk" = "yes" && test "$have_polkit" = "yes"],[enable_gtk=yes],[enable_gtk=no]) + ]) + AS_IF([test "$enable_gtk" = "yes"],[ +- AS_IF([test "$have_gtk" = "yes" && test "$have_polkit" = "yes"],[],[ +- AC_MSG_ERROR([--enable-gtk requires gtk+-3.0 >= gtk_required_version and polkit-gobject-1]) ++ AS_IF([test "$have_gtk" = "yes"],[],[ ++ AC_MSG_ERROR([--enable-gtk requires gtk+-3.0 >= gtk_required_version]) + ]) + ]) + AM_CONDITIONAL(ENABLE_GTK, test "$enable_gtk" = "yes") +-- +2.8.1 + 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/files/0001-configure-Add-option-to-enable-disable-polkit.patch b/meta/recipes-kernel/sysprof/files/0001-configure-Add-option-to-enable-disable-polkit.patch new file mode 100644 index 0000000000..158d9975f2 --- /dev/null +++ b/meta/recipes-kernel/sysprof/files/0001-configure-Add-option-to-enable-disable-polkit.patch @@ -0,0 +1,41 @@ +From 2b4005d72d3393933a7914be102ea65505c536cc Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" <maxin.john@intel.com> +Date: Thu, 21 Jul 2016 11:53:31 +0300 +Subject: [PATCH] configure: Add option to enable/disable polkit + +Changes the configure behaviour from autodetecting the polkit by default +to having an option to disable it explicitly + +Upstream-Status: Pending + +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + configure.ac | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 2246d5a..3d3fe0f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -104,10 +104,18 @@ PKG_CHECK_MODULES(GTK, + [gtk+-3.0 >= gtk_required_version], + [have_gtk=yes], + [have_gtk=no]) ++AC_ARG_ENABLE([polkit], ++ AS_HELP_STRING([--disable-polkit], [Do not use Polkit]), ++ [enable_polkit="$enableval"], [enable_polkit="yes"]) ++ ++AS_IF([test "x$enable_polkit" = "xyes"], [ + PKG_CHECK_MODULES(POLKIT, + [polkit-gobject-1], + [have_polkit=yes], + [have_polkit=no]) ++ ]) ++AM_CONDITIONAL([HAVE_POLKIT], [test "x$enable_polkit" = "xyes"]) ++ + PKG_CHECK_MODULES(SYSTEMD, + [libsystemd >= systemd_required_version], + [have_systemd=yes], +-- +2.4.0 + 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 Index: git/elfparser.h =================================================================== ---- git.orig/elfparser.h 2011-07-16 18:57:41.000000000 -0700 -+++ git/elfparser.h 2011-07-16 20:28:54.733829895 -0700 +--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700 ++++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700 @@ -17,6 +17,10 @@ */ #include <glib.h> 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 60e7f707a3..0000000000 --- a/meta/recipes-kernel/sysprof/files/rmb-arm.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: git/util.h -=================================================================== ---- git.orig/util.h 2010-12-07 22:41:57.156243001 -0600 -+++ git/util.h 2010-12-07 22:43:47.616243002 -0600 -@@ -37,4 +37,13 @@ - #define cpu_relax() asm volatile("" ::: "memory"); - #endif - -+#ifdef __arm__ -+/* -+ * Use the __kuser_memory_barrier helper in the CPU helper page. See -+ * arch/arm/kernel/entry-armv.S in the kernel source for details. -+ */ -+#define rmb() ((void(*)(void))0xffff0fa0)() -+#define cpu_relax() asm volatile("":::"memory") -+#endif -+ - #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 84f968ef00..0000000000 --- a/meta/recipes-kernel/sysprof/files/rmb-mips.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: git/util.h -=================================================================== ---- git.orig/util.h 2010-12-08 01:22:44.486243001 -0600 -+++ git/util.h 2010-12-08 01:23:27.836243001 -0600 -@@ -37,4 +37,15 @@ - #define cpu_relax() asm volatile("" ::: "memory"); - #endif - -+#ifdef __mips__ -+#define rmb() asm volatile( \ -+ ".set mips2\n\t" \ -+ "sync\n\t" \ -+ ".set mips0" \ -+ : /* no output */ \ -+ : /* no input */ \ -+ : "memory") -+#define cpu_relax() asm volatile("" ::: "memory") -+#endif -+ - #endif diff --git a/meta/recipes-kernel/sysprof/sysprof_3.22.3.bb b/meta/recipes-kernel/sysprof/sysprof_3.22.3.bb new file mode 100644 index 0000000000..26310634c6 --- /dev/null +++ b/meta/recipes-kernel/sysprof/sysprof_3.22.3.bb @@ -0,0 +1,34 @@ +SUMMARY = "System-wide Performance Profiler for Linux" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" + +inherit gnomebase gettext systemd upstream-version-is-even + +DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" + +SRC_URI += " \ + file://define-NT_GNU_BUILD_ID.patch \ + file://0001-configure-Add-option-to-enable-disable-polkit.patch \ + file://0001-Disable-check-for-polkit-for-UI.patch \ + file://0001-Avoid-building-docs.patch \ + " +SRC_URI[archive.sha256sum] = "e6dca325b3014440f457a92db18ffe342a35888db3f0756694a99b9652796367" +SRC_URI[archive.md5sum] = "9514065dc752105240e5567c13708af4" + +AUTOTOOLS_AUXDIR = "${S}/build-aux" + +EXTRA_OECONF = "--enable-compile-warnings" + +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" +PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit dbus" + +SOLIBS = ".so" +FILES_SOLIBSDEV = "" +FILES_${PN} += "${datadir}/icons/" + +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'sysprof2.service', '', d)}" + +# We do not yet work for aarch64. +COMPATIBLE_HOST = "^(?!aarch64).*" diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb deleted file mode 100644 index bd34f005d2..0000000000 --- a/meta/recipes-kernel/sysprof/sysprof_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "sysprof - System-wide Performance Profiler for Linux" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "gtk+ libglade" - -SRCREV = "4692f85f625f4fd969cef4ab5dc47cc4655c87f9" -PR = "r2" -PV = "1.1.8+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" -SRC_URI_append_mips = " file://rmb-mips.patch" - -S = "${WORKDIR}/git" - -inherit autotools |