diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-06-03 12:15:01 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 16:53:36 +0100 |
| commit | 1310a71a81e0b19919fc622f676fa6106be6cf9d (patch) | |
| tree | 62e82f00a1a4d7915e89a826b9af3ce972471f9f | |
| parent | c4f58052e13ebd9dd58ebe4a654ae725e10e85f8 (diff) | |
| download | openembedded-core-contrib-1310a71a81e0b19919fc622f676fa6106be6cf9d.tar.gz | |
systemtap: update to 3.0
Remove docproc-build-fix.patch, as the build problem it's fixing
now happens only if building html docs is explicitly enabled
(which we do not do).
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.inc | 5 |
3 files changed, 3 insertions, 23 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch b/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch deleted file mode 100644 index 33a89940ae..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> - -Index: git/doc/SystemTap_Tapset_Reference/Makefile.am -=================================================================== ---- git.orig/doc/SystemTap_Tapset_Reference/Makefile.am 2012-04-13 08:43:46.263339003 -0500 -+++ git/doc/SystemTap_Tapset_Reference/Makefile.am 2012-04-13 09:31:22.470083915 -0500 -@@ -27,6 +27,10 @@ - noinst_PROGRAMS = docproc - SRCTREE=$(abs_top_srcdir)/ - DOCPROC=$(abs_builddir)/docproc -+docproc_LINK = $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ -+ -+docproc.o: $(srcdir)/docproc.c -+ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/docproc.c - - all: $(PDFDOCS) stamp-htmldocs stamp-mandocs - tapsets.xml: docproc $(shell find $(SRCTREE)/tapset -name '*.stp') diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index cf6a96a611..a4bda6930e 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Script-directed dynamic tracing and performance analysis tool for Lin require systemtap_git.inc -DEPENDS = "elfutils sqlite3 systemtap-native" +DEPENDS = "elfutils sqlite3 systemtap-native json-c" DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native" DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext" diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index 656f15f808..ce976edeb5 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,10 +1,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "7009f2f782e52d6105fe68d6ea2a9820a1099c06" -PV = "2.9" +SRCREV = "616ec7a0b916df7785d911b824c3df6eb022b213" +PV = "3.0" SRC_URI = "git://sourceware.org/git/systemtap.git \ - file://docproc-build-fix.patch \ file://obsolete_automake_macros.patch \ file://system_map_location.patch \ file://configure-allow-to-disable-libvirt.patch \ |