From: Saul Wold <sgw@linux.intel.com>
Date: Thu, 13 Sep 2012 03:22:34 +0000 (-0700)
Subject: kernelshark: add missing ${D}
X-Git-Tag: 2015-4~9144
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c3cff64708cb078405f5ecd9bca6801031786bc4;p=openembedded-core.git

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

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
index 877296550e..70cfd96d64 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e"
 
 SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5"
-PR = "r2"
+PR = "r3"
 PV = "1.2+git${SRCPV}"
 
 DEPENDS = "gtk+"
@@ -24,5 +24,6 @@ FILESPATH = "${FILE_DIRNAME}/trace-cmd"
 
 do_install() {
 	oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui
-	rm -rf ${datadir}/trace-cmd
+	rm -rf ${D}${datadir}/trace-cmd
+	rmdir ${D}${datadir}
 }