diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2015-05-08 15:42:23 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-13 14:32:00 +0200 |
commit | c9874710968508aa48a23cc123cb3005cb4f1a30 (patch) | |
tree | 239f44a5f9797fba99ad9b4fc2224036a43198b2 /meta-oe/recipes-navigation | |
parent | a9fb1739072f3a267ed16c8a983e189cdcbb1cab (diff) | |
download | meta-openembedded-c9874710968508aa48a23cc123cb3005cb4f1a30.tar.gz |
navit: fix PN -> BPN for multilib
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
-rw-r--r-- | meta-oe/recipes-navigation/navit/navit.inc | 24 | ||||
-rw-r--r-- | 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 4f09ff1b8..26b91b3da 100644 --- a/meta-oe/recipes-navigation/navit/navit.inc +++ b/meta-oe/recipes-navigation/navit/navit.inc | |||
@@ -60,19 +60,19 @@ SRC_URI += "file://navit.xml \ | |||
60 | file://plugins.xml \ | 60 | file://plugins.xml \ |
61 | " | 61 | " |
62 | 62 | ||
63 | FILES_${PN} += "${libdir}/${PN}/*/*.so ${datadir}/icons" | 63 | FILES_${PN} += "${libdir}/${BPN}/*/*.so ${datadir}/icons" |
64 | FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" | 64 | FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug" |
65 | FILES_${PN}-maptool = " ${bindir}/maptool " | 65 | FILES_${PN}-maptool = " ${bindir}/maptool " |
66 | FILES_${PN}-config = " ${datadir}/navit/*.xml " | 66 | FILES_${PN}-config = " ${datadir}/navit/*.xml " |
67 | FILES_${PN}-dbus = " ${datadir}/dbus-1/services/ ${libdir}/${PN}/binding/libbinding_dbus.so " | 67 | FILES_${PN}-dbus = " ${datadir}/dbus-1/services/ ${libdir}/${BPN}/binding/libbinding_dbus.so " |
68 | FILES_${PN}-speech-cmdline = " ${libdir}/${PN}/speech/libspeech_cmdline.so " | 68 | FILES_${PN}-speech-cmdline = " ${libdir}/${BPN}/speech/libspeech_cmdline.so " |
69 | FILES_${PN}-speech-dbus = " ${libdir}/${PN}/speech/libspeech_dbus.so " | 69 | FILES_${PN}-speech-dbus = " ${libdir}/${BPN}/speech/libspeech_dbus.so " |
70 | FILES_${PN}-gui-gtk = " ${libdir}/${PN}/gui/libgui_gtk.so " | 70 | FILES_${PN}-gui-gtk = " ${libdir}/${BPN}/gui/libgui_gtk.so " |
71 | FILES_${PN}-gui-qml = " ${libdir}/${PN}/gui/libgui_qml.so ${datadir}/navit/skins/ " | 71 | FILES_${PN}-gui-qml = " ${libdir}/${BPN}/gui/libgui_qml.so ${datadir}/navit/skins/ " |
72 | FILES_${PN}-gui-internal = " ${libdir}/${PN}/gui/libgui_internal.so " | 72 | FILES_${PN}-gui-internal = " ${libdir}/${BPN}/gui/libgui_internal.so " |
73 | FILES_${PN}-graphics-sdl = " ${libdir}/${PN}/graphics/libgraphics_sdl.so " | 73 | FILES_${PN}-graphics-sdl = " ${libdir}/${BPN}/graphics/libgraphics_sdl.so " |
74 | FILES_${PN}-graphics-qt = " ${libdir}/${PN}/graphics/libgraphics_qt_qpainter.so " | 74 | FILES_${PN}-graphics-qt = " ${libdir}/${BPN}/graphics/libgraphics_qt_qpainter.so " |
75 | FILES_${PN}-graphics-gtk = " ${libdir}/${PN}/graphics/libgraphics_gtk_drawing_area.so " | 75 | FILES_${PN}-graphics-gtk = " ${libdir}/${BPN}/graphics/libgraphics_gtk_drawing_area.so " |
76 | FILES_${PN}-icons = "/usr/share/navit/xpm/" | 76 | FILES_${PN}-icons = "/usr/share/navit/xpm/" |
77 | 77 | ||
78 | do_configure_prepend() { | 78 | do_configure_prepend() { |
@@ -84,7 +84,7 @@ do_install_append() { | |||
84 | # fix QA issue | 84 | # fix QA issue |
85 | sed -i 's#Categories=GTK;Utility;Geography;#Categories=Graphics;#g' ${D}${datadir}/applications/navit.desktop | 85 | sed -i 's#Categories=GTK;Utility;Geography;#Categories=Graphics;#g' ${D}${datadir}/applications/navit.desktop |
86 | 86 | ||
87 | rm ${D}${libdir}/${PN}/*/*.la | 87 | rm ${D}${libdir}/${BPN}/*/*.la |
88 | 88 | ||
89 | #Use split config | 89 | #Use split config |
90 | mv ${D}${datadir}/navit/navit.xml ${D}${datadir}/navit/navit.default.xml | 90 | 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 eff1eb32f..bdfbb4b62 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" | |||
4 | PV = "0.2.0+svnr${SRCPV}" | 4 | PV = "0.2.0+svnr${SRCPV}" |
5 | PR = "${INC_PR}.3" | 5 | PR = "${INC_PR}.3" |
6 | 6 | ||
7 | S = "${WORKDIR}/${PN}" | 7 | S = "${WORKDIR}/${BPN}" |
8 | SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;protocol=http \ | 8 | SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;protocol=http \ |
9 | file://freetype-include-path.patch \ | 9 | file://freetype-include-path.patch \ |
10 | file://configure.add.imlib2.option.patch \ | 10 | file://configure.add.imlib2.option.patch \ |