[oe-commits] Hongxu Jia : libcanberra: fix QA Warning Files/ directories were installed but not shipped

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 2112e618f28df5d5eeae9679c045ab8f5914e50e
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=2112e618f28df5d5eeae9679c045ab8f5914e50e

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Tue Apr 22 14:48:55 2014 +0800

libcanberra: fix QA Warning Files/directories were installed but not shipped

...
WARNING: QA Issue: lib32-libcanberra: Files/directories were installed but not shipped
  /usr/lib/libcanberra-0.29/libcanberra-gstreamer.so
  /usr/lib/libcanberra-0.29/libcanberra-multi.so
  /usr/lib/libcanberra-0.29/libcanberra-pulse.so
  /usr/lib/libcanberra-0.29/libcanberra-null.so
  /usr/lib/libcanberra-0.29/libcanberra-alsa.so
  /usr/lib/libcanberra-0.29/.debug
  /usr/lib/libcanberra-0.29/.debug/libcanberra-gstreamer.so
  /usr/lib/libcanberra-0.29/.debug/libcanberra-multi.so
  /usr/lib/libcanberra-0.29/.debug/libcanberra-pulse.so
  /usr/lib/libcanberra-0.29/.debug/libcanberra-null.so
  /usr/lib/libcanberra-0.29/.debug/libcanberra-alsa.so
...

The dynamic libraries were installed into '${BPN}-${PV}' rather than '${P}'.

Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
index 332b62b..b10c3fd 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
@@ -32,7 +32,7 @@ PACKAGECONFIG[alsa] = "--enable-alsa, --disable-alsa, alsa-lib"
 PACKAGECONFIG[pulseaudio] = "--enable-pulse, --disable-pulse, pulseaudio"
 
 python populate_packages_prepend() {
-    plugindir = d.expand('${libdir}/${P}/')
+    plugindir = d.expand('${libdir}/${BPN}-${PV}/')
     do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' )
     do_split_packages(d, plugindir, '^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' )
 }
@@ -44,7 +44,7 @@ FILES_${PN} = "${bindir}/ ${libdir}/${BPN}.so.*"
 
 FILES_${PN}-dev += "${datadir}/vala/vapi ${libdir}/*/modules/*.la ${libdir}/*/*.la"
 
-FILES_${PN}-dbg += "${libdir}/${P}/.debug ${libdir}/gtk-*/modules/.debug"
+FILES_${PN}-dbg += "${libdir}/${BPN}-${PV}/.debug ${libdir}/gtk-*/modules/.debug"
 
 FILES_${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \
                     ${libdir}/gtk-2.0/modules/*.so \