summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd.inc12
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch51
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch36
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd_git.bb (renamed from meta/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb)8
4 files changed, 6 insertions, 101 deletions
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd.inc b/meta/recipes-kernel/trace-cmd/trace-cmd.inc
index fb8c5fa7f7..feb56e108a 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd.inc
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd.inc
@@ -1,14 +1,12 @@
1SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5" 1SRCREV = "0813335d2e49291e7ab6a4365cec2baa05813eda"
2PR = "r3" 2PV = "2.5.3+git${SRCPV}"
3PV = "1.2+git${SRCPV}"
4 3
5inherit pkgconfig pythonnative 4inherit pkgconfig
6 5
7FILESEXTRAPATHS =. "${FILE_DIRNAME}/trace-cmd:" 6FILESEXTRAPATHS =. "${FILE_DIRNAME}/trace-cmd:"
8 7
9SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \ 8SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git;branch=trace-cmd-stable-v2.5 \
10 file://addldflags.patch \
11 file://make-docs-optional.patch \
12 file://blktrace-api-compatibility.patch \ 9 file://blktrace-api-compatibility.patch \
13" 10"
11
14S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
deleted file mode 100644
index 14730db905..0000000000
--- a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1trace-cmd: Cross-compile fixes for LDFLAGS and include path
2
3Add ability for the Makefile to respect LDFLAGS.
4Also remove hardcoded /usr/local/include include path.
5
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(-)
14
15Index: git/Makefile
16===================================================================
17--- git.orig/Makefile
18+++ git/Makefile
19@@ -202,12 +202,13 @@ export Q VERBOSE
20 TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION)
21 KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION)
22
23-INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES)
24+INCLUDES = -I. $(CONFIG_INCLUDES)
25
26 include features.mk
27
28 # Set compile option CFLAGS if not set elsewhere
29 CFLAGS ?= -g -Wall
30+LDFLAGS ?=
31
32 ifndef NO_PTRACE
33 ifneq ($(call try-cc,$(SOURCE_PTRACE),),y)
34@@ -251,7 +252,7 @@ do_fpic_compile = \
35
36 do_app_build = \
37 ($(print_app_build) \
38- $(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS))
39+ $(CC) $^ -rdynamic -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS))
40
41 do_compile_shared_library = \
42 ($(print_shared_lib_compile) \
43@@ -263,7 +264,7 @@ do_compile_plugin_obj = \
44
45 do_plugin_build = \
46 ($(print_plugin_build) \
47- $(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<)
48+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -nostartfiles -o $@ $<)
49
50 do_build_static_lib = \
51 ($(print_static_lib_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
deleted file mode 100644
index 8402426c5f..0000000000
--- a/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch
+++ /dev/null
@@ -1,36 +0,0 @@
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_2.3.2.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
index a4d5382aaf..b1ac7892dd 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
@@ -6,13 +6,7 @@ require trace-cmd.inc
6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
7 file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \ 7 file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \
8 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \ 8 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
9 file://trace-input.c;beginline=5;endine=8;md5=dafd8a1cade30b847a8686dd3628cea4 \ 9 file://trace-input.c;beginline=5;endline=8;md5=3ec82f43bbe0cfb5951ff414ef4d44d0 \
10"
11SRCREV = "79e08f8edb38c4c5098486caaa87ca90ba00f547"
12
13PV = "2.3.2+git${SRCPV}"
14
15SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git;branch=trace-cmd-stable-v2.3 \
16" 10"
17 11
18EXTRA_OEMAKE = "\ 12EXTRA_OEMAKE = "\