mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
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>
This commit is contained in:
Richard Purdie
@@ -1,39 +0,0 @@
|
||||
From 5eb10d90af9178edb65e6091ae939d1b5b19bb78 Mon Sep 17 00:00:00 2001
|
||||
From: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
Date: Tue, 23 Sep 2014 04:47:10 -0400
|
||||
Subject: [PATCH] systemtap: allow to disable libvirt
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
---
|
||||
configure.ac | 13 +++++++++----
|
||||
1 file changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index a631ae7..cb4885b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -525,10 +525,15 @@ dnl Check for the libvirt and libxml2 devel packages
|
||||
|
||||
dnl We require libvirt >= 1.0.2 because stapvirt relies on the
|
||||
dnl virDomainOpenChannel function, which was implemented in 1.0.2.
|
||||
-PKG_CHECK_MODULES([libvirt], [libvirt >= 1.0.2], [
|
||||
- have_libvirt=yes
|
||||
- AC_DEFINE([HAVE_LIBVIRT],[1],[Define to 1 if libvirt development libraries are installed])
|
||||
- ], [have_libvirt=no])
|
||||
+AC_ARG_ENABLE([libvirt],
|
||||
+ AS_HELP_STRING([--disable-libvirt], [Do not use libvirt even if present]))
|
||||
+
|
||||
+if test "$enable_libvirt" != no; then
|
||||
+ PKG_CHECK_MODULES([libvirt], [libvirt >= 1.0.2], [
|
||||
+ have_libvirt=yes
|
||||
+ AC_DEFINE([HAVE_LIBVIRT],[1],[Define to 1 if libvirt development libraries are installed])
|
||||
+ ], [have_libvirt=no])
|
||||
+fi
|
||||
AM_CONDITIONAL([HAVE_LIBVIRT], [test "${have_libvirt}" = "yes"])
|
||||
PKG_CHECK_MODULES([libxml2], [libxml-2.0], [
|
||||
have_libxml2=yes
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
From 93fc4744fedf6fc593ee656968da97f7b1862ada Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Tue, 4 Oct 2016 16:37:53 +0100
|
||||
Subject: [PATCH 4/6] systemtap: rationalise dependencies
|
||||
|
||||
Add an option to explicitly disable the monitor (and therefore the dependency on
|
||||
json-c and ncurses).
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
---
|
||||
configure.ac | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
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.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
|
||||
AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
|
||||
fi
|
||||
+fi
|
||||
+AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"])
|
||||
|
||||
AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [
|
||||
old_CFLAGS="$CFLAGS"
|
||||
@@ -1,33 +0,0 @@
|
||||
From 43f1b04449bb1cf7e0092263f1c2a25f3fca08ef Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Tue, 8 Nov 2016 23:07:41 +0000
|
||||
Subject: [PATCH 5/6] systemtap: remove explicit msgfmt check
|
||||
|
||||
There is no need to explicitly check that msgfmt was found as the gettext macros
|
||||
handle this for us if NLS is enabled.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
---
|
||||
configure.ac | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 2ea9b3cbf..95417f59c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -36,10 +36,6 @@ AC_CHECK_FUNCS(openat)
|
||||
AM_GNU_GETTEXT(external)
|
||||
AM_GNU_GETTEXT_VERSION([0.19.4])
|
||||
|
||||
-if test "x$GMSGFMT" = "x:"; then
|
||||
- AC_MSG_ERROR([missing gnu /usr/bin/msgfmt])
|
||||
-fi
|
||||
-
|
||||
# We want the 'PYTHON' varible to be python version 2. We also want
|
||||
# our custom 'PYTHON3' varible to be python version 3.
|
||||
#
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
Fix time_t print because in x32 ABI is long long int instead of long int.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
|
||||
|
||||
diff --git a/cache.cxx b/cache.cxx
|
||||
index 3546b30..19c77ca 100644
|
||||
--- a/cache.cxx
|
||||
+++ b/cache.cxx
|
||||
@@ -294,7 +294,11 @@ clean_cache(systemtap_session& s)
|
||||
{
|
||||
//interval not passed, don't continue
|
||||
if (s.verbose > 1)
|
||||
+#if defined(__x86_64__) && defined (__ILP32__)
|
||||
+ clog << _F("Cache cleaning skipped, interval not reached %lld s / %lu s.",
|
||||
+#else
|
||||
clog << _F("Cache cleaning skipped, interval not reached %lu s / %lu s.",
|
||||
+#endif
|
||||
(current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl;
|
||||
return;
|
||||
}
|
||||
@@ -302,7 +306,11 @@ clean_cache(systemtap_session& s)
|
||||
{
|
||||
//interval reached, continue
|
||||
if (s.verbose > 1)
|
||||
+#if defined(__x86_64__) && defined (__ILP32__)
|
||||
+ clog << _F("Cleaning cache, interval reached %lld s > %lu s.",
|
||||
+#else
|
||||
clog << _F("Cleaning cache, interval reached %lu s > %lu s.",
|
||||
+#endif
|
||||
(current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl;
|
||||
}
|
||||
|
||||
@@ -1,13 +1,9 @@
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||
SRCREV = "a25199c9580b9b66424c494d3bf39c4d1b7e1f7b"
|
||||
SRCREV = "57c9aca9f1ff32a6add10e02ecd33b7314fad499"
|
||||
PV = "4.1+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://sourceware.org/git/systemtap.git \
|
||||
file://configure-allow-to-disable-libvirt.patch \
|
||||
file://x32_abi_time.patch \
|
||||
file://monitor-option.patch \
|
||||
file://no-msgfmt-check.patch \
|
||||
file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
|
||||
file://0001-Install-python-modules-to-correct-library-dir.patch \
|
||||
file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \
|
||||
|
||||
Reference in New Issue
Block a user