diff options
author | Victor Kamensky via Openembedded-core <openembedded-core@lists.openembedded.org> | 2018-07-20 20:38:52 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-26 13:16:31 +0100 |
commit | d8a60b324c340bf88e2e8650f4771030490709c5 (patch) | |
tree | 90e7676ac6fb98c96b7224039564484a7619d6fe /meta/recipes-kernel/systemtap/systemtap/monitor-option.patch | |
parent | 1a0a1785766c12003e3f8848852af84cae203e6b (diff) | |
download | openembedded-core-contrib-d8a60b324c340bf88e2e8650f4771030490709c5.tar.gz |
systemtap: 3.2 -> 3.3
Upgrade systemtap from 3.2 to 3.3: Removed all backported patches.
Removed "remove quotes around -I include" pending patch since 3.3
got similar fix already. Resolved merge conflict in and
regenerated monitor-option.patch patch.
Signed-off-by: Victor Kamensky <kamensky@cisco.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-kernel/systemtap/systemtap/monitor-option.patch')
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/monitor-option.patch | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch b/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch index b7ee0701b1..9313a5aba3 100644 --- a/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch +++ b/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch @@ -13,18 +13,18 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 6bd0c5fc4..2ea9b3cbf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -752,13 +752,16 @@ dnl We want either (or both) python probe support. +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac ++++ git/configure.ac +@@ -766,13 +766,16 @@ dnl We want either (or both) python prob AM_CONDITIONAL([HAVE_PYTHON_PROBES], [test "x$have_python2_support" = "xyes" -o "x$have_python3_support" = "xyes"]) +AC_ARG_ENABLE([monitor], AS_HELP_STRING([--disable-monitor],[Disable monitor])) +if test "$enable_monitor" != "no"; then dnl Check for presence of json-c and ncurses for use in monitor mode - PKG_CHECK_MODULES([jsonc], [json-c >= 0.12], [have_jsonc=yes], [have_jsonc=no]) + PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no]) PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no]) -AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"]) if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then @@ -35,6 +35,3 @@ index 6bd0c5fc4..2ea9b3cbf 100644 AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [ old_CFLAGS="$CFLAGS" --- -2.11.0 - |