trace-cmd: Update to version 2.5.3

Updating adds new features including the very useful 'profile' option.

Changes include:

 - Remove addldflags.patch (already upstream in the new version).

 - Remove make-docs-optional.patch (docs are built in a separate target
   in the new version).

 - Update SRC_URI, SRCREV, PR, and PV in the .inc file and don't
   override them in the recipe.

 - Fix a typo in LIC_FILES_CHECKSUM so 'endline' is properly defined.

 - Drop PR.

(From OE-Core rev: 30eba39bd3b915477c584d8bebd194446497175e)

Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ben Shelton
2015-02-19 14:11:05 -06:00
committed by Richard Purdie
parent b3e92f4b46
commit 6dc2030dcf
4 changed files with 6 additions and 101 deletions

View File

@@ -1,14 +1,12 @@
SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5"
PR = "r3"
PV = "1.2+git${SRCPV}"
SRCREV = "0813335d2e49291e7ab6a4365cec2baa05813eda"
PV = "2.5.3+git${SRCPV}"
inherit pkgconfig pythonnative
inherit pkgconfig
FILESEXTRAPATHS =. "${FILE_DIRNAME}/trace-cmd:"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \
file://addldflags.patch \
file://make-docs-optional.patch \
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git;branch=trace-cmd-stable-v2.5 \
file://blktrace-api-compatibility.patch \
"
S = "${WORKDIR}/git"

View File

@@ -1,51 +0,0 @@
trace-cmd: Cross-compile fixes for LDFLAGS and include path
Add ability for the Makefile to respect LDFLAGS.
Also remove hardcoded /usr/local/include include path.
Upstream-Status: Accepted [Post 1.2: 5f576e9af7ad706774d9764a9ae3989376797c0e]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
Makefile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Index: git/Makefile
===================================================================
--- git.orig/Makefile
+++ git/Makefile
@@ -202,12 +202,13 @@ export Q VERBOSE
TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION)
KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION)
-INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES)
+INCLUDES = -I. $(CONFIG_INCLUDES)
include features.mk
# Set compile option CFLAGS if not set elsewhere
CFLAGS ?= -g -Wall
+LDFLAGS ?=
ifndef NO_PTRACE
ifneq ($(call try-cc,$(SOURCE_PTRACE),),y)
@@ -251,7 +252,7 @@ do_fpic_compile = \
do_app_build = \
($(print_app_build) \
- $(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS))
+ $(CC) $^ -rdynamic -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS))
do_compile_shared_library = \
($(print_shared_lib_compile) \
@@ -263,7 +264,7 @@ do_compile_plugin_obj = \
do_plugin_build = \
($(print_plugin_build) \
- $(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<)
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -nostartfiles -o $@ $<)
do_build_static_lib = \
($(print_static_lib_build) \

View File

@@ -1,36 +0,0 @@
Disable building docs until we have asciidocs available as a recipe.
Upstream-Status: Inappropriate [Account for missing dependency, the lazy way]
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
Makefile | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
Index: git/Makefile
===================================================================
--- git.orig/Makefile
+++ git/Makefile
@@ -327,7 +327,9 @@ TARGETS = $(CMD_TARGETS) $(GUI_TARGETS)
# If you want kernelshark, then do: make gui
###
-all: all_cmd doc show_gui_make
+# Make doc optional
+#all: all_cmd doc show_gui_make
+all: all_cmd show_gui_make
all_cmd: $(CMD_TARGETS)
@@ -503,7 +505,9 @@ install_python: $(PYTHON_SO_INSTALL) $(P
install_cmd: all_cmd install_plugins install_python
$(Q)$(call do_install,trace-cmd,$(bindir_SQ))
-install: install_cmd install_doc
+# Make doc optional
+#install: install_cmd install_doc
+install: install_cmd
@echo "Note: to install the gui, type \"make install_gui\""
install_gui: install_cmd gui

View File

@@ -6,13 +6,7 @@ require trace-cmd.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \
file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
file://trace-input.c;beginline=5;endine=8;md5=dafd8a1cade30b847a8686dd3628cea4 \
"
SRCREV = "79e08f8edb38c4c5098486caaa87ca90ba00f547"
PV = "2.3.2+git${SRCPV}"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git;branch=trace-cmd-stable-v2.3 \
file://trace-input.c;beginline=5;endline=8;md5=3ec82f43bbe0cfb5951ff414ef4d44d0 \
"
EXTRA_OEMAKE = "\