diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-kernel/trace-cmd/trace-cmd | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-kernel/trace-cmd/trace-cmd')
3 files changed, 116 insertions, 0 deletions
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch new file mode 100644 index 0000000000..14730db905 --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | trace-cmd: Cross-compile fixes for LDFLAGS and include path | ||
2 | |||
3 | Add ability for the Makefile to respect LDFLAGS. | ||
4 | Also remove hardcoded /usr/local/include include path. | ||
5 | |||
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(-) | ||
14 | |||
15 | Index: 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/blktrace-api-compatibility.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch new file mode 100644 index 0000000000..0789e9fdf7 --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | trace-cmd: Add blktrace_api compatibility for TC_BARRIER | ||
2 | |||
3 | Newer kernels replace TC_BARRIER with TC_FLUSH. Ensure trace-cmd | ||
4 | can build regardless of the linux-kernel-headers version. | ||
5 | |||
6 | Upstream-Status: Innapropriate [Stop gap] | ||
7 | |||
8 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> | ||
9 | |||
10 | diff --git a/plugin_blk.c b/plugin_blk.c | ||
11 | index 9327b17..c8e5e1c 100644 | ||
12 | --- a/plugin_blk.c | ||
13 | +++ b/plugin_blk.c | ||
14 | @@ -44,6 +44,15 @@ struct blk_data { | ||
15 | unsigned short pdu_len; | ||
16 | }; | ||
17 | |||
18 | +/* | ||
19 | + * Newer kernels don't define BLK_TC_BARRIER and have replaced it with | ||
20 | + * BLK_TC_FLUSH. In this case, define it here and report FLUSHES as BARRIERS as | ||
21 | + * a workaround, as described in: | ||
22 | + * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=c09c47caedc9854d59378d6e34c989e51cfdd2b4 | ||
23 | + */ | ||
24 | +#ifndef BLK_TC_BARRIER | ||
25 | +#define BLK_TC_BARRIER 1<<2 | ||
26 | +#endif | ||
27 | static void fill_rwbs(char *rwbs, int action, unsigned int bytes) | ||
28 | { | ||
29 | int i = 0; | ||
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 0000000000..8402426c5f --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | Disable building docs until we have asciidocs available as a recipe. | ||
2 | |||
3 | Upstream-Status: Inappropriate [Account for missing dependency, the lazy way] | ||
4 | |||
5 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> | ||
6 | |||
7 | --- | ||
8 | Makefile | 8 ++++++-- | ||
9 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
10 | |||
11 | Index: 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 | ||