diff options
| author | wangmy <wangmy@fujitsu.com> | 2021-05-20 07:48:39 +0800 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2021-05-23 08:27:16 -0700 |
| commit | 15938ed77bfb3acf1c66e30782cc82b7da10bc44 (patch) | |
| tree | 6f973bf4175f0b0ae81667eeb47e2aba68ce1929 | |
| parent | bf945de831db67832b1c4deff8033c70ef5831c2 (diff) | |
| download | meta-openembedded-15938ed77bfb3acf1c66e30782cc82b7da10bc44.tar.gz | |
trace-cmd: Conflict resolution
perf(oe-core) also uses the doc included in plugins/, so package it in own subdirs of trace-cmd.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit d8402fdd6f6710effd763a0a9c06c83255e39722)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb b/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb index d39afff8e4..906ca2c1f3 100644 --- a/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb +++ b/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb | |||
| @@ -12,6 +12,8 @@ S = "${WORKDIR}/git" | |||
| 12 | 12 | ||
| 13 | do_install() { | 13 | do_install() { |
| 14 | oe_runmake etcdir=${sysconfdir} DESTDIR=${D} install | 14 | oe_runmake etcdir=${sysconfdir} DESTDIR=${D} install |
| 15 | mkdir -p ${D}${libdir}/traceevent/plugins/${BPN} | ||
| 16 | mv ${D}/${libdir}/traceevent/plugins/*.so ${D}${libdir}/traceevent/plugins/${BPN}/ | ||
| 15 | } | 17 | } |
| 16 | 18 | ||
| 17 | FILES_${PN} += "${libdir}/traceevent/plugins" | 19 | FILES_${PN} += "${libdir}/traceevent/plugins" |