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-04 14:13:35 +0100 |
commit | d2d5bf5c68d78647e287491fe75d28fbcfc10411 (patch) | |
tree | 1a174ec07c007b7af2aaf5abcbb6e35a65952d6d | |
parent | 41f18826ac44456af7e8eb7ba53d52885ecd66f0 (diff) | |
download | poky-d2d5bf5c68d78647e287491fe75d28fbcfc10411.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).
(From OE-Core rev: 1310a71a81e0b19919fc622f676fa6106be6cf9d)
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 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> | ||
4 | |||
5 | Index: git/doc/SystemTap_Tapset_Reference/Makefile.am | ||
6 | =================================================================== | ||
7 | --- git.orig/doc/SystemTap_Tapset_Reference/Makefile.am 2012-04-13 08:43:46.263339003 -0500 | ||
8 | +++ git/doc/SystemTap_Tapset_Reference/Makefile.am 2012-04-13 09:31:22.470083915 -0500 | ||
9 | @@ -27,6 +27,10 @@ | ||
10 | noinst_PROGRAMS = docproc | ||
11 | SRCTREE=$(abs_top_srcdir)/ | ||
12 | DOCPROC=$(abs_builddir)/docproc | ||
13 | +docproc_LINK = $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ | ||
14 | + | ||
15 | +docproc.o: $(srcdir)/docproc.c | ||
16 | + $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/docproc.c | ||
17 | |||
18 | all: $(PDFDOCS) stamp-htmldocs stamp-mandocs | ||
19 | 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 | |||
2 | 2 | ||
3 | require systemtap_git.inc | 3 | require systemtap_git.inc |
4 | 4 | ||
5 | DEPENDS = "elfutils sqlite3 systemtap-native" | 5 | DEPENDS = "elfutils sqlite3 systemtap-native json-c" |
6 | DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native" | 6 | DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native" |
7 | DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext" | 7 | DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext" |
8 | 8 | ||
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 @@ | |||
1 | LICENSE = "GPLv2" | 1 | LICENSE = "GPLv2" |
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 2 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
3 | SRCREV = "7009f2f782e52d6105fe68d6ea2a9820a1099c06" | 3 | SRCREV = "616ec7a0b916df7785d911b824c3df6eb022b213" |
4 | PV = "2.9" | 4 | PV = "3.0" |
5 | 5 | ||
6 | SRC_URI = "git://sourceware.org/git/systemtap.git \ | 6 | SRC_URI = "git://sourceware.org/git/systemtap.git \ |
7 | file://docproc-build-fix.patch \ | ||
8 | file://obsolete_automake_macros.patch \ | 7 | file://obsolete_automake_macros.patch \ |
9 | file://system_map_location.patch \ | 8 | file://system_map_location.patch \ |
10 | file://configure-allow-to-disable-libvirt.patch \ | 9 | file://configure-allow-to-disable-libvirt.patch \ |