Commit Graph

12 Commits

Author SHA1 Message Date
Martin Jansa
c1a2482c71 kernelshark: add dependency on libxml2
* fixes floating dependency:
  kernelshark-1.2+gitAUTOINC+7055ffd37b: kernelshark rdepends on libxml2, but it isn't a build dependency? [build-deps]

(From OE-Core rev: 99300ef40c4b1f7eeaf5503fa293114d7b602d30)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-11 11:27:34 +01:00
Robert Yang
dfc203c54b kernelshark: fix recompile error
Fixed:
make: *** No rule to make target `/path/to/sysroot/4.9.0/include/stddef.h', needed by `parse-events.o'.  Stop.
make: *** Waiting for unfinished jobs....
ERROR: oe_runmake failed

This happens when upgrade gcc from 4.9.0 to 4.9.1, and the
.parse-events.d isn't regenerated when recompile, the content of it are:

[snip]
parse-events.o: /path/to/sysroot/4.9.0/include/stddef.h
[snip]

And Makefile includes the .parse-events.d file if it exists, so there
would be errors when /path/to/sysroot/4.9.0/include/stddef.h doesn't
exist.

Remove .*.d (a few .d files, its Makefile uses this wildcard) will fix
the problem.

(From OE-Core rev: 46b697b5861041dc3f67723efae301163b623f22)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-11 10:53:06 +01:00
Darren Hart
5be57ba62b kernelshark: Remove trace-cmd from the kernelshark package
Fixes [YOCTO 6550]

Images installing both trace-cmd and kernelshark would fail with:

error: file /usr/bin/trace-cmd conflicts between attempted installs of
kernelshark-1.2+git0+7055ffd37b-r3.core2_32 and
trace-cmd-1.2+git0+7055ffd37b-r3.core2_32

This patch removes ${bindir}/trace-cmd from the install prior to
packaging, as is already done with the ${datadir}.

Reported-by: California Sullivan <california.l.sullivan@intel.com>
(From OE-Core rev: 3cd92ac652e12fc2f4d67cbc5e7f83dd95f6bd1d)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
(cherry picked from commit eb08ae8f729ef77329892d19b23ddfdaa7953de0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-19 00:18:21 +01:00
Petter Mabäcker
bf359458a9 trace-cmd: refactoring recipe
Fixes [YOCTO #4497]

Refactoring recipe to avoid duplicated entries in trace-cmd and
kernelshark bb-files. Also remove usage of FILESPATH and split package
unique patches into separate dirs.

(From OE-Core rev: bc57d7041e126850245e4a5ab0211979b49b97ff)

Signed-off-by: Petter Mabäcker <petter@technux.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-05-13 19:32:05 +01:00
Chong Lu
29665931b6 kernelshark/trace-cmd: fix syntax error of shell
Delete "<<<" syntax of bash in Makefile, else we would get following error:

        Syntax error: redirection unexpected

[YOCTO #6112]

(From OE-Core rev: c2892fa27d9918aa4ce00a106a254ddfd44aa0f1)

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-10 17:35:15 +01:00
Paul Eggleton
cec8b230cf Replace one-line DESCRIPTION with SUMMARY
A lot of our recipes had short one-line DESCRIPTION values and no
SUMMARY value set. In this case it's much better to just set SUMMARY
since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY
is at least useful. I also took the opportunity to fix up a lot of the
new SUMMARY values, making them concisely explain the function of the
recipe / package where possible.

(From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 12:50:18 +00:00
Jackie Huang
88c5e10d62 remove the unnecessary protocol parameters
It's not necessary to specify the protocol parameter when it's the
default protocol for the fetcher, e.g. the default protocol for
git fetcher it git, "protocol=git" isn't needed.

(From OE-Core rev: a2bab241c64428d5109c3c5ac5de4463fbad70c5)

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-30 16:23:46 +01:00
Saul Wold
e5561887e7 kernelshark: add missing ${D}
This was noticed by the following warnings of files that should have been removed!

WARNING: QA Issue: kernelshark: Files/directories were installed but not shipped
  /usr/share
  /usr/share/trace-cmd
  /usr/share/trace-cmd/plugins
  /usr/share/trace-cmd/plugins/plugin_blk.so
  /usr/share/trace-cmd/plugins/plugin_sched_switch.so
  /usr/share/trace-cmd/plugins/plugin_kmem.so
  /usr/share/trace-cmd/plugins/plugin_kvm.so
  /usr/share/trace-cmd/plugins/plugin_function.so
  /usr/share/trace-cmd/plugins/plugin_jbd2.so
  /usr/share/trace-cmd/plugins/plugin_hrtimer.so
  /usr/share/trace-cmd/plugins/plugin_mac80211.so
  /usr/share/trace-cmd/plugins/.debug
  /usr/share/trace-cmd/plugins/.debug/plugin_blk.so
  /usr/share/trace-cmd/plugins/.debug/plugin_sched_switch.so
  /usr/share/trace-cmd/plugins/.debug/plugin_kmem.so
  /usr/share/trace-cmd/plugins/.debug/plugin_kvm.so
  /usr/share/trace-cmd/plugins/.debug/plugin_function.so
  /usr/share/trace-cmd/plugins/.debug/plugin_jbd2.so
  /usr/share/trace-cmd/plugins/.debug/plugin_hrtimer.so
  /usr/share/trace-cmd/plugins/.debug/plugin_mac80211.so

(From OE-Core rev: c3cff64708cb078405f5ecd9bca6801031786bc4)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-14 09:50:25 +01:00
Saul Wold
60e503a4e5 kernelshark: remove duplicate trace-cmd plugins
Since kernelshark depends on trace-cmd, there is no reason to
install and package the plugins that are part of trace-cmd.

[YOCTO #238]

(From OE-Core rev: d6614b0ac7c83b2e17e68903a85fc8374e936c1a)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-02 05:52:11 -07:00
Richard Purdie
e72a154603 kernelshark: Inherit pythonnative
(From OE-Core rev: 2b23cd1c8f81de989bce1ecab2d5b4328328de86)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-07 10:55:55 +01:00
Darren Hart
64f3e247df trace-cmd: Add blktrace_api compatibility for TC_BARRIER
Newer kernels replace TC_BARRIER with TC_FLUSH. Ensure trace-cmd
can build regardless of the linux-kernel-headers version.

This is intended as a stop-gap to get the builds working again. A
proper fix will need to be discussed with the trace-cmd community.

RP: Tweaked the SRC_URI to remove unnecessary path and added PR bump
(From OE-Core rev: 869372e7e11b9ba38fcfb721c460404c6f31db95)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-01 16:54:07 +00:00
Darren Hart
80986e1182 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>
2011-12-01 10:50:10 +00:00