summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-06 08:28:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-06 12:45:47 +0100
commit4aa7e00724a2b3596d4d453d250422bb1ab91ca3 (patch)
tree9d051fb945dc3a48d066c1e896478a0b08e9dc4a
parent7289dccd09fcabdc917396a7675e19f466e4445c (diff)
downloadpoky-4aa7e00724a2b3596d4d453d250422bb1ab91ca3.tar.gz
systemtap: Drop patches merged upstream
Several of our patches were merged upstream just beyond our current version. Update to that version and drop them. (From OE-Core rev: 815a956f7bf4de031b7764f27f3eac005a15b5ce) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch39
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/monitor-option.patch37
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch33
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch34
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc6
5 files changed, 1 insertions, 148 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch b/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch
deleted file mode 100644
index b4f2fbc066..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 5eb10d90af9178edb65e6091ae939d1b5b19bb78 Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Tue, 23 Sep 2014 04:47:10 -0400
4Subject: [PATCH] systemtap: allow to disable libvirt
5
6Upstream-Status: Pending
7
8Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
9---
10 configure.ac | 13 +++++++++----
11 1 file changed, 9 insertions(+), 4 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index a631ae7..cb4885b 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -525,10 +525,15 @@ dnl Check for the libvirt and libxml2 devel packages
18
19 dnl We require libvirt >= 1.0.2 because stapvirt relies on the
20 dnl virDomainOpenChannel function, which was implemented in 1.0.2.
21-PKG_CHECK_MODULES([libvirt], [libvirt >= 1.0.2], [
22- have_libvirt=yes
23- AC_DEFINE([HAVE_LIBVIRT],[1],[Define to 1 if libvirt development libraries are installed])
24- ], [have_libvirt=no])
25+AC_ARG_ENABLE([libvirt],
26+ AS_HELP_STRING([--disable-libvirt], [Do not use libvirt even if present]))
27+
28+if test "$enable_libvirt" != no; then
29+ PKG_CHECK_MODULES([libvirt], [libvirt >= 1.0.2], [
30+ have_libvirt=yes
31+ AC_DEFINE([HAVE_LIBVIRT],[1],[Define to 1 if libvirt development libraries are installed])
32+ ], [have_libvirt=no])
33+fi
34 AM_CONDITIONAL([HAVE_LIBVIRT], [test "${have_libvirt}" = "yes"])
35 PKG_CHECK_MODULES([libxml2], [libxml-2.0], [
36 have_libxml2=yes
37--
381.7.9.5
39
diff --git a/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch b/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
deleted file mode 100644
index 9313a5aba3..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
+++ /dev/null
@@ -1,37 +0,0 @@
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
6Add an option to explicitly disable the monitor (and therefore the dependency on
7json-c and ncurses).
8
9Upstream-Status: Pending
10Signed-off-by: Ross Burton <ross.burton@intel.com>
11
12---
13 configure.ac | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
15
16Index: git/configure.ac
17===================================================================
18--- git.orig/configure.ac
19+++ git/configure.ac
20@@ -766,13 +766,16 @@ dnl We want either (or both) python prob
21 AM_CONDITIONAL([HAVE_PYTHON_PROBES],
22 [test "x$have_python2_support" = "xyes" -o "x$have_python3_support" = "xyes"])
23
24+AC_ARG_ENABLE([monitor], AS_HELP_STRING([--disable-monitor],[Disable monitor]))
25+if test "$enable_monitor" != "no"; then
26 dnl Check for presence of json-c and ncurses for use in monitor mode
27 PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
28 PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
29-AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"])
30 if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
31 AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
32 fi
33+fi
34+AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"])
35
36 AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [
37 old_CFLAGS="$CFLAGS"
diff --git a/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch b/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch
deleted file mode 100644
index 2c860b19e5..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch
+++ /dev/null
@@ -1,33 +0,0 @@
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
6There is no need to explicitly check that msgfmt was found as the gettext macros
7handle this for us if NLS is enabled.
8
9Upstream-Status: Pending
10Signed-off-by: Ross Burton <ross.burton@intel.com>
11
12---
13 configure.ac | 4 ----
14 1 file changed, 4 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 2ea9b3cbf..95417f59c 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -36,10 +36,6 @@ AC_CHECK_FUNCS(openat)
21 AM_GNU_GETTEXT(external)
22 AM_GNU_GETTEXT_VERSION([0.19.4])
23
24-if test "x$GMSGFMT" = "x:"; then
25- AC_MSG_ERROR([missing gnu /usr/bin/msgfmt])
26-fi
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/x32_abi_time.patch b/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch
deleted file mode 100644
index 28a7eae407..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Fix time_t print because in x32 ABI is long long int instead of long int.
2
3Upstream-Status: Pending
4
5Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
6
7diff --git a/cache.cxx b/cache.cxx
8index 3546b30..19c77ca 100644
9--- a/cache.cxx
10+++ b/cache.cxx
11@@ -294,7 +294,11 @@ clean_cache(systemtap_session& s)
12 {
13 //interval not passed, don't continue
14 if (s.verbose > 1)
15+#if defined(__x86_64__) && defined (__ILP32__)
16+ clog << _F("Cache cleaning skipped, interval not reached %lld s / %lu s.",
17+#else
18 clog << _F("Cache cleaning skipped, interval not reached %lu s / %lu s.",
19+#endif
20 (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl;
21 return;
22 }
23@@ -302,7 +306,11 @@ clean_cache(systemtap_session& s)
24 {
25 //interval reached, continue
26 if (s.verbose > 1)
27+#if defined(__x86_64__) && defined (__ILP32__)
28+ clog << _F("Cleaning cache, interval reached %lld s > %lu s.",
29+#else
30 clog << _F("Cleaning cache, interval reached %lu s > %lu s.",
31+#endif
32 (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl;
33 }
34
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index f16f851e61..abb2b3743b 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,13 +1,9 @@
1LICENSE = "GPLv2" 1LICENSE = "GPLv2"
2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
3SRCREV = "a25199c9580b9b66424c494d3bf39c4d1b7e1f7b" 3SRCREV = "57c9aca9f1ff32a6add10e02ecd33b7314fad499"
4PV = "4.1+git${SRCPV}" 4PV = "4.1+git${SRCPV}"
5 5
6SRC_URI = "git://sourceware.org/git/systemtap.git \ 6SRC_URI = "git://sourceware.org/git/systemtap.git \
7 file://configure-allow-to-disable-libvirt.patch \
8 file://x32_abi_time.patch \
9 file://monitor-option.patch \
10 file://no-msgfmt-check.patch \
11 file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ 7 file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
12 file://0001-Install-python-modules-to-correct-library-dir.patch \ 8 file://0001-Install-python-modules-to-correct-library-dir.patch \
13 file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ 9 file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \