summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-02-24 18:02:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 23:27:09 +0000
commit89c1220c40371f296b69ac42f5ae6e78517ff422 (patch)
tree1e3cfbebfb940b3661472ef97af35532e934d28b /meta
parentc9f9446585377e4873431849351b7c4f52191301 (diff)
downloadpoky-89c1220c40371f296b69ac42f5ae6e78517ff422.tar.gz
systemtap: update to 3.1
Removed patches are in upstream. Rebase monitor-option.patch and no-msgfmt-check.patch Add support for python 3 probes (this necessitates the 0001-Do-not-let-configure-write-a-python-location-into-th.patch and the Add 0001-Install-python-modules-to-correct-library-dir.patch to install python modules to correct destination). Add perl to RDEPENDS to fix a QA warning about one of the installed files. (From OE-Core rev: e3bccfba499565ea13f154a11dadcab48ef5e0ab) 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/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch25
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch36
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch41
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/monitor-option.patch26
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch22
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb9
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc8
8 files changed, 109 insertions, 73 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch b/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch
new file mode 100644
index 0000000000..742b1187fc
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch
@@ -0,0 +1,25 @@
1From ab29615ed6c2e779b472903564dc683dc1015de7 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 22 Feb 2017 13:37:33 +0200
4Subject: [PATCH] Do not let configure write a python location into the dtrace
5 binary
6
7Upstream-Status: Inappropriate [oe-core specific]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 dtrace.in | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/dtrace.in b/dtrace.in
14index 5e1cf8079..a24229cbc 100644
15--- a/dtrace.in
16+++ b/dtrace.in
17@@ -1,4 +1,4 @@
18-#!@preferred_python@
19+#!/usr/bin/python3
20 # vim: et sta sts=4 sw=4 ts=8
21
22 # This handles the systemtap equivalent of
23--
242.11.0
25
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch b/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch
new file mode 100644
index 0000000000..528864cc93
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch
@@ -0,0 +1,36 @@
1From 2ada22f05460223924efe54080cb4419e2b4c276 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 24 Feb 2017 17:53:02 +0200
4Subject: [PATCH] Install python modules to correct library dir.
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 python/Makefile.am | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/python/Makefile.am b/python/Makefile.am
13index a254480f9..efe9f3c01 100644
14--- a/python/Makefile.am
15+++ b/python/Makefile.am
16@@ -47,7 +47,7 @@ install-exec-local:
17 if HAVE_PYTHON2_PROBES
18 (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON) setup.py build \
19 --build-base $(shell readlink -f $(builddir))/py2build \
20- install --prefix $(DESTDIR)$(prefix) \
21+ install --prefix $(DESTDIR)$(prefix) --install-lib=$(DESTDIR)${pythondir} \
22 --single-version-externally-managed \
23 --record $(shell readlink -f $(builddir))/py2build/install_files.txt \
24 --verbose)
25@@ -55,7 +55,7 @@ endif
26 if HAVE_PYTHON3_PROBES
27 (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
28 --build-base $(shell readlink -f $(builddir))/py3build \
29- install --prefix $(DESTDIR)$(prefix) \
30+ install --prefix $(DESTDIR)$(prefix) --install-lib=$(DESTDIR)${python3dir} \
31 --single-version-externally-managed \
32 --record $(shell readlink -f $(builddir))/py3build/install_files.txt \
33 --verbose)
34--
352.11.0
36
diff --git a/meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch b/meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch
deleted file mode 100644
index 2bf0742a1d..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From d940aa0079c253b958cf9158e9ec7922ecf464f9 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Wed, 9 Nov 2016 00:00:48 +0000
7Subject: [PATCH] staprun: fix linking if monitor is enabled
8
9If the monitor is enabled, monitor.c needs to link against json-c and ncurses.
10Instead of adding these linker flags to AM_CFLAGS (global CC flags) add them to
11stapio_LDADD.
12
13Apart from being the "right" thing to do, this fixes build failures on systems
14such as current Ubuntu (which defaults to using --as-needed and similar) where
15link order is important.
16---
17 staprun/Makefile.am | 7 +++----
18 1 file changed, 3 insertions(+), 4 deletions(-)
19
20diff --git a/staprun/Makefile.am b/staprun/Makefile.am
21index 63d4088..66b3e21 100644
22--- a/staprun/Makefile.am
23+++ b/staprun/Makefile.am
24@@ -42,12 +42,11 @@ staprun_CXXFLAGS += $(nss_CFLAGS)
25 staprun_LDADD += $(nss_LIBS)
26 endif
27
28-if HAVE_MONITOR_LIBS
29-AM_CFLAGS += $(jsonc_LIBS) $(ncurses_LIBS)
30-endif
31-
32 stapio_SOURCES = stapio.c mainloop.c common.c ctl.c relay.c relay_old.c monitor.c
33 stapio_LDADD = libstrfloctime.a -lpthread
34+if HAVE_MONITOR_LIBS
35+stapio_LDADD += $(jsonc_LIBS) $(ncurses_LIBS)
36+endif
37
38 man_MANS = staprun.8
39
40--
412.8.1
diff --git a/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch b/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
index 7d43a79e21..b7ee0701b1 100644
--- a/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
+++ b/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
@@ -1,21 +1,30 @@
1From 93fc4744fedf6fc593ee656968da97f7b1862ada Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 4 Oct 2016 16:37:53 +0100
4Subject: [PATCH 4/6] systemtap: rationalise dependencies
5
1Add an option to explicitly disable the monitor (and therefore the dependency on 6Add an option to explicitly disable the monitor (and therefore the dependency on
2json-c and ncurses). 7json-c and ncurses).
3 8
4Upstream-Status: Pending 9Upstream-Status: Pending
5Signed-off-by: Ross Burton <ross.burton@intel.com> 10Signed-off-by: Ross Burton <ross.burton@intel.com>
6 11
12---
13 configure.ac | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
15
7diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
8index cd781a2..e56079a 100644 17index 6bd0c5fc4..2ea9b3cbf 100644
9--- a/configure.ac 18--- a/configure.ac
10+++ b/configure.ac 19+++ b/configure.ac
11@@ -570,13 +574,16 @@ dnl See if we have enough libraries and tools to build the virt server 20@@ -752,13 +752,16 @@ dnl We want either (or both) python probe support.
12 fi 21 AM_CONDITIONAL([HAVE_PYTHON_PROBES],
13 AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a "${have_libxml2}" == "yes" -a "$enable_virt" != "no"]) 22 [test "x$have_python2_support" = "xyes" -o "x$have_python3_support" = "xyes"])
14 23
15+AC_ARG_ENABLE([monitor], AS_HELP_STRING([--disable-monitor],[Disable monitor])) 24+AC_ARG_ENABLE([monitor], AS_HELP_STRING([--disable-monitor],[Disable monitor]))
16+if test "$enable_monitor" != "no"; then 25+if test "$enable_monitor" != "no"; then
17 dnl Check for presence of json-c and ncurses for use in monitor mode 26 dnl Check for presence of json-c and ncurses for use in monitor mode
18 PKG_CHECK_MODULES([jsonc], [json-c], [have_jsonc=yes], [have_jsonc=no]) 27 PKG_CHECK_MODULES([jsonc], [json-c >= 0.12], [have_jsonc=yes], [have_jsonc=no])
19 PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no]) 28 PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
20-AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"]) 29-AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"])
21 if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then 30 if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
@@ -23,6 +32,9 @@ index cd781a2..e56079a 100644
23 fi 32 fi
24+fi 33+fi
25+AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"]) 34+AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"])
26 35
27 AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [ 36 AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [
28 old_CFLAGS="$CFLAGS" 37 old_CFLAGS="$CFLAGS"
38--
392.11.0
40
diff --git a/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch b/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch
index 471e62c56b..2c860b19e5 100644
--- a/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch
+++ b/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch
@@ -1,15 +1,33 @@
1From 43f1b04449bb1cf7e0092263f1c2a25f3fca08ef Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 8 Nov 2016 23:07:41 +0000
4Subject: [PATCH 5/6] systemtap: remove explicit msgfmt check
5
1There is no need to explicitly check that msgfmt was found as the gettext macros 6There is no need to explicitly check that msgfmt was found as the gettext macros
2handle this for us if NLS is enabled. 7handle this for us if NLS is enabled.
3 8
4Upstream-Status: Pending 9Upstream-Status: Pending
5Signed-off-by: Ross Burton <ross.burton@intel.com> 10Signed-off-by: Ross Burton <ross.burton@intel.com>
6 11
12---
13 configure.ac | 4 ----
14 1 file changed, 4 deletions(-)
15
7diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
8index e56079a..284bbe0 100644 17index 2ea9b3cbf..95417f59c 100644
9--- a/configure.ac 18--- a/configure.ac
10+++ b/configure.ac 19+++ b/configure.ac
11@@ -39,4 +38,0 @@ AM_GNU_GETTEXT_VERSION([0.19.4]) 20@@ -36,10 +36,6 @@ AC_CHECK_FUNCS(openat)
21 AM_GNU_GETTEXT(external)
22 AM_GNU_GETTEXT_VERSION([0.19.4])
23
12-if test "x$GMSGFMT" = "x:"; then 24-if test "x$GMSGFMT" = "x:"; then
13- AC_MSG_ERROR([missing gnu /usr/bin/msgfmt]) 25- AC_MSG_ERROR([missing gnu /usr/bin/msgfmt])
14-fi 26-fi
15- 27-
28 # We want the 'PYTHON' varible to be python version 2. We also want
29 # our custom 'PYTHON3' varible to be python version 3.
30 #
31--
322.11.0
33
diff --git a/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch b/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
deleted file mode 100644
index 988cda4f0c..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4Index: git/configure.ac
5===================================================================
6--- git.orig/configure.ac
7+++ git/configure.ac
8@@ -19,7 +19,6 @@ AC_PROG_LN_S
9 AC_PROG_CC
10 AC_PROG_CXX
11 AC_PROG_CPP
12-AM_PROG_CC_STDC
13 AM_PROG_CC_C_O
14 AC_PROG_RANLIB
15 AC_OBJEXT
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 43bf69e877..fed368a38b 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -4,12 +4,12 @@ require systemtap_git.inc
4 4
5DEPENDS = "boost elfutils" 5DEPENDS = "boost elfutils"
6 6
7RDEPENDS_${PN} += "python3-core bash" 7RDEPENDS_${PN} += "python3-core bash perl"
8 8
9EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ 9EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
10 --without-nss --without-avahi --without-dyninst \ 10 --without-nss --without-avahi --without-dyninst \
11 --disable-server --disable-grapher --enable-prologues \ 11 --disable-server --disable-grapher --enable-prologues \
12 --with-python3 \ 12 --with-python3 --without-python2-probes \
13 ac_cv_prog_have_javac=no \ 13 ac_cv_prog_have_javac=no \
14 ac_cv_prog_have_jar=no " 14 ac_cv_prog_have_jar=no "
15 15
@@ -17,11 +17,12 @@ STAP_DOCS ?= "--disable-docs --disable-publican --disable-refdocs"
17 17
18EXTRA_OECONF += "${STAP_DOCS} " 18EXTRA_OECONF += "${STAP_DOCS} "
19 19
20PACKAGECONFIG ??= "sqlite monitor" 20PACKAGECONFIG ??= "sqlite monitor python3-probes"
21PACKAGECONFIG[libvirt] = "--enable-libvirt,--disable-libvirt,libvirt" 21PACKAGECONFIG[libvirt] = "--enable-libvirt,--disable-libvirt,libvirt"
22PACKAGECONFIG[sqlite] = "--enable-sqlite,--disable-sqlite,sqlite3" 22PACKAGECONFIG[sqlite] = "--enable-sqlite,--disable-sqlite,sqlite3"
23PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c" 23PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c"
24PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes,python3-setuptools-native"
24 25
25inherit autotools gettext pkgconfig 26inherit autotools gettext pkgconfig distutils3-base
26 27
27BBCLASSEXTEND = "native nativesdk" 28BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index a0f0e6859a..c9612308a5 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,16 +1,16 @@
1LICENSE = "GPLv2" 1LICENSE = "GPLv2"
2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
3SRCREV = "616ec7a0b916df7785d911b824c3df6eb022b213" 3SRCREV = "b8ea350dc13adb6190d9044a5b80110a4c441270"
4PV = "3.0" 4PV = "3.1"
5 5
6SRC_URI = "git://sourceware.org/git/systemtap.git \ 6SRC_URI = "git://sourceware.org/git/systemtap.git \
7 file://obsolete_automake_macros.patch \
8 file://system_map_location.patch \ 7 file://system_map_location.patch \
9 file://configure-allow-to-disable-libvirt.patch \ 8 file://configure-allow-to-disable-libvirt.patch \
10 file://x32_abi_time.patch \ 9 file://x32_abi_time.patch \
11 file://monitor-option.patch \ 10 file://monitor-option.patch \
12 file://no-msgfmt-check.patch \ 11 file://no-msgfmt-check.patch \
13 file://fix-monitor-linking.patch \ 12 file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
13 file://0001-Install-python-modules-to-correct-library-dir.patch \
14 " 14 "
15 15
16# systemtap doesn't support mips 16# systemtap doesn't support mips