summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-11-30 17:58:52 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-01 10:50:10 +0000
commit80986e1182e6b1ef7eed177dfd06a884d639bd87 (patch)
tree95e855bed658f13d3b917b2b50368b92493233c1 /meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch
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>
Diffstat (limited to 'meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch')
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch36
1 files changed, 36 insertions, 0 deletions
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 @@
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