summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-12-01 01:58:52 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-01 10:50:10 (GMT)
commit80986e1182e6b1ef7eed177dfd06a884d639bd87 (patch)
tree95e855bed658f13d3b917b2b50368b92493233c1
parentfa25490782bddf83c276cf27790edec379256508 (diff)
downloadpoky-80986e1182e6b1ef7eed177dfd06a884d639bd87.tar.gz
trace-cmd: Update to 1.2 (includes kernelshark)
Update the trace-cmd and kernelshark recipes to version 1.2. Rename the recipes to the more descriptive trace-cmd_1.2.bb and kernelshark_1.2.bb respectively. Update addldflags.patch for 1.2 and current Upstream-Status (Accepted). Add make-docs-optional.patch to avoid building the new doc target which requires asciidocs. We should add asciidocs and properly package the docs, but for now it's more important to get the sources current. (From OE-Core rev: 73ac48377491561151658617d8cc45936242eb0c) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb (renamed from meta/recipes-kernel/trace-cmd/kernelshark_git.bb)9
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch28
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch36
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb (renamed from meta/recipes-kernel/trace-cmd/trace-cmd_git.bb)9
4 files changed, 64 insertions, 18 deletions
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
index 733bddc..aa070a9 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
+++ b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
@@ -3,9 +3,9 @@ LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
4 file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" 4 file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e"
5 5
6SRCREV = "6c696cec3f264a9399241b6e648f58bc97117d49" 6SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5"
7PR = r1 7PR = "r0"
8PV = "1.0.5+git${SRCPV}" 8PV = "1.2+git${SRCPV}"
9 9
10DEPENDS = "gtk+" 10DEPENDS = "gtk+"
11RDEPENDS_${PN} = "trace-cmd" 11RDEPENDS_${PN} = "trace-cmd"
@@ -13,7 +13,8 @@ RDEPENDS_${PN} = "trace-cmd"
13inherit pkgconfig 13inherit pkgconfig
14 14
15SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \ 15SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \
16 file://addldflags.patch" 16 file://addldflags.patch \
17 file://make-docs-optional.patch"
17S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
18 19
19EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui" 20EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui"
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
index 8e8f578..14730db 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
@@ -1,29 +1,37 @@
1Upstream-Status: Pending 1trace-cmd: Cross-compile fixes for LDFLAGS and include path
2 2
3Add ability for the Makefile to respect LDFLAGS. 3Add ability for the Makefile to respect LDFLAGS.
4
5Also remove hardcoded /usr/local/include include path. 4Also remove hardcoded /usr/local/include include path.
6 5
7RP 7/5/2011 6Upstream-Status: Accepted [Post 1.2: 5f576e9af7ad706774d9764a9ae3989376797c0e]
7
8Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9Signed-off-by: Darren Hart <dvhart@linux.intel.com>
10
11---
12 Makefile | 7 ++++---
13 1 file changed, 4 insertions(+), 3 deletions(-)
8 14
9Index: git/Makefile 15Index: git/Makefile
10=================================================================== 16===================================================================
11--- git.orig/Makefile 2011-07-05 11:58:11.699910550 +0100 17--- git.orig/Makefile
12+++ git/Makefile 2011-07-05 23:30:12.319920617 +0100 18+++ git/Makefile
13@@ -189,10 +189,11 @@ 19@@ -202,12 +202,13 @@ export Q VERBOSE
14 TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION) 20 TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION)
15 KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION) 21 KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION)
16 22
17-INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES) 23-INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES)
18+INCLUDES = -I. $(CONFIG_INCLUDES) 24+INCLUDES = -I. $(CONFIG_INCLUDES)
19 25
26 include features.mk
27
20 # Set compile option CFLAGS if not set elsewhere 28 # Set compile option CFLAGS if not set elsewhere
21 CFLAGS ?= -g -Wall 29 CFLAGS ?= -g -Wall
22+LDFLAGS ?= 30+LDFLAGS ?=
23 31
24 # Append required CFLAGS 32 ifndef NO_PTRACE
25 override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) 33 ifneq ($(call try-cc,$(SOURCE_PTRACE),),y)
26@@ -225,7 +226,7 @@ 34@@ -251,7 +252,7 @@ do_fpic_compile = \
27 35
28 do_app_build = \ 36 do_app_build = \
29 ($(print_app_build) \ 37 ($(print_app_build) \
@@ -32,7 +40,7 @@ Index: git/Makefile
32 40
33 do_compile_shared_library = \ 41 do_compile_shared_library = \
34 ($(print_shared_lib_compile) \ 42 ($(print_shared_lib_compile) \
35@@ -237,7 +238,7 @@ 43@@ -263,7 +264,7 @@ do_compile_plugin_obj = \
36 44
37 do_plugin_build = \ 45 do_plugin_build = \
38 ($(print_plugin_build) \ 46 ($(print_plugin_build) \
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch
new file mode 100644
index 0000000..8402426
--- /dev/null
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch
@@ -0,0 +1,36 @@
1Disable building docs until we have asciidocs available as a recipe.
2
3Upstream-Status: Inappropriate [Account for missing dependency, the lazy way]
4
5Signed-off-by: Darren Hart <dvhart@linux.intel.com>
6
7---
8 Makefile | 8 ++++++--
9 1 file changed, 6 insertions(+), 2 deletions(-)
10
11Index: git/Makefile
12===================================================================
13--- git.orig/Makefile
14+++ git/Makefile
15@@ -327,7 +327,9 @@ TARGETS = $(CMD_TARGETS) $(GUI_TARGETS)
16 # If you want kernelshark, then do: make gui
17 ###
18
19-all: all_cmd doc show_gui_make
20+# Make doc optional
21+#all: all_cmd doc show_gui_make
22+all: all_cmd show_gui_make
23
24 all_cmd: $(CMD_TARGETS)
25
26@@ -503,7 +505,9 @@ install_python: $(PYTHON_SO_INSTALL) $(P
27 install_cmd: all_cmd install_plugins install_python
28 $(Q)$(call do_install,trace-cmd,$(bindir_SQ))
29
30-install: install_cmd install_doc
31+# Make doc optional
32+#install: install_cmd install_doc
33+install: install_cmd
34 @echo "Note: to install the gui, type \"make install_gui\""
35
36 install_gui: install_cmd gui
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
index 1278dc7..1b9231b 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
@@ -3,14 +3,15 @@ LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
4 file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" 4 file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e"
5 5
6SRCREV = "6c696cec3f264a9399241b6e648f58bc97117d49" 6SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5"
7PR = "r2" 7PR = "r0"
8PV = "1.0.5+git${SRCPV}" 8PV = "1.2+git${SRCPV}"
9 9
10inherit pkgconfig 10inherit pkgconfig
11 11
12SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \ 12SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \
13 file://addldflags.patch" 13 file://addldflags.patch \
14 file://make-docs-optional.patch"
14S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
15 16
16EXTRA_OEMAKE = "'prefix=${prefix}'" 17EXTRA_OEMAKE = "'prefix=${prefix}'"