diff options
author | Darren Hart <dvhart@linux.intel.com> | 2011-11-30 17:58:52 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-01 10:50:10 +0000 |
commit | 80986e1182e6b1ef7eed177dfd06a884d639bd87 (patch) | |
tree | 95e855bed658f13d3b917b2b50368b92493233c1 /meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch | |
parent | fa25490782bddf83c276cf27790edec379256508 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch')
-rw-r--r-- | meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch index 8e8f578e61..14730db905 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 @@ | |||
1 | Upstream-Status: Pending | 1 | trace-cmd: Cross-compile fixes for LDFLAGS and include path |
2 | 2 | ||
3 | Add ability for the Makefile to respect LDFLAGS. | 3 | Add ability for the Makefile to respect LDFLAGS. |
4 | |||
5 | Also remove hardcoded /usr/local/include include path. | 4 | Also remove hardcoded /usr/local/include include path. |
6 | 5 | ||
7 | RP 7/5/2011 | 6 | Upstream-Status: Accepted [Post 1.2: 5f576e9af7ad706774d9764a9ae3989376797c0e] |
7 | |||
8 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
9 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> | ||
10 | |||
11 | --- | ||
12 | Makefile | 7 ++++--- | ||
13 | 1 file changed, 4 insertions(+), 3 deletions(-) | ||
8 | 14 | ||
9 | Index: git/Makefile | 15 | Index: 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) \ |