[oe-commits] Yi Zhao : navit: fix PN -> BPN for multilib

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: fido-next
Commit: 47d9bc4f5d669fda38e56812ecf69ea5e2713177
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=47d9bc4f5d669fda38e56812ecf69ea5e2713177

Author: Yi Zhao <yi.zhao at windriver.com>
Date:   Fri May  8 15:42:23 2015 +0800

navit: fix PN -> BPN for multilib

Signed-off-by: Yi Zhao <yi.zhao at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>

---

 meta-oe/recipes-navigation/navit/navit.inc    | 24 ++++++++++++------------
 meta-oe/recipes-navigation/navit/navit_svn.bb |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta-oe/recipes-navigation/navit/navit.inc b/meta-oe/recipes-navigation/navit/navit.inc
index 9d4f4ec..e39008e 100644
--- a/meta-oe/recipes-navigation/navit/navit.inc
+++ b/meta-oe/recipes-navigation/navit/navit.inc
@@ -57,19 +57,19 @@ SRC_URI += "file://navit.xml \
             file://plugins.xml \
 "
 
-FILES_${PN} += "${libdir}/${PN}/*/*.so ${datadir}/icons"
-FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
+FILES_${PN} += "${libdir}/${BPN}/*/*.so ${datadir}/icons"
+FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug"
 FILES_${PN}-maptool = " ${bindir}/maptool "
 FILES_${PN}-config = " ${datadir}/navit/*.xml "
-FILES_${PN}-dbus = " ${datadir}/dbus-1/services/ ${libdir}/${PN}/binding/libbinding_dbus.so "
-FILES_${PN}-speech-cmdline = " ${libdir}/${PN}/speech/libspeech_cmdline.so "
-FILES_${PN}-speech-dbus = " ${libdir}/${PN}/speech/libspeech_dbus.so "
-FILES_${PN}-gui-gtk = " ${libdir}/${PN}/gui/libgui_gtk.so "
-FILES_${PN}-gui-qml = " ${libdir}/${PN}/gui/libgui_qml.so ${datadir}/navit/skins/ "
-FILES_${PN}-gui-internal = " ${libdir}/${PN}/gui/libgui_internal.so "
-FILES_${PN}-graphics-sdl = " ${libdir}/${PN}/graphics/libgraphics_sdl.so "
-FILES_${PN}-graphics-qt = " ${libdir}/${PN}/graphics/libgraphics_qt_qpainter.so "
-FILES_${PN}-graphics-gtk = " ${libdir}/${PN}/graphics/libgraphics_gtk_drawing_area.so "
+FILES_${PN}-dbus = " ${datadir}/dbus-1/services/ ${libdir}/${BPN}/binding/libbinding_dbus.so "
+FILES_${PN}-speech-cmdline = " ${libdir}/${BPN}/speech/libspeech_cmdline.so "
+FILES_${PN}-speech-dbus = " ${libdir}/${BPN}/speech/libspeech_dbus.so "
+FILES_${PN}-gui-gtk = " ${libdir}/${BPN}/gui/libgui_gtk.so "
+FILES_${PN}-gui-qml = " ${libdir}/${BPN}/gui/libgui_qml.so ${datadir}/navit/skins/ "
+FILES_${PN}-gui-internal = " ${libdir}/${BPN}/gui/libgui_internal.so "
+FILES_${PN}-graphics-sdl = " ${libdir}/${BPN}/graphics/libgraphics_sdl.so "
+FILES_${PN}-graphics-qt = " ${libdir}/${BPN}/graphics/libgraphics_qt_qpainter.so "
+FILES_${PN}-graphics-gtk = " ${libdir}/${BPN}/graphics/libgraphics_gtk_drawing_area.so "
 FILES_${PN}-icons = "/usr/share/navit/xpm/"
 
 do_configure_prepend() {
@@ -81,7 +81,7 @@ do_install_append() {
     # fix QA issue
     sed -i 's#Categories=GTK;Utility;Geography;#Categories=Graphics;#g' ${D}${datadir}/applications/navit.desktop
 
-    rm ${D}${libdir}/${PN}/*/*.la
+    rm ${D}${libdir}/${BPN}/*/*.la
 
     #Use split config
     mv ${D}${datadir}/navit/navit.xml ${D}${datadir}/navit/navit.default.xml
diff --git a/meta-oe/recipes-navigation/navit/navit_svn.bb b/meta-oe/recipes-navigation/navit/navit_svn.bb
index eff1eb3..bdfbb4b 100644
--- a/meta-oe/recipes-navigation/navit/navit_svn.bb
+++ b/meta-oe/recipes-navigation/navit/navit_svn.bb
@@ -4,7 +4,7 @@ SRCREV = "5310"
 PV = "0.2.0+svnr${SRCPV}"
 PR = "${INC_PR}.3"
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;protocol=http \
     file://freetype-include-path.patch \
     file://configure.add.imlib2.option.patch \