X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-ivi-common%2Frecipes-automotive%2Fautomotive-message-broker%2Fautomotive-message-broker_git.bb;h=fb1cb774f81e22f8af52a321b45524f87d1ececc;hb=refs%2Fchanges%2F33%2F6933%2F3;hp=4873f12a06ba55cd1998716c03e0c166544c4da7;hpb=8fc3dc485d876f7e98b7ecc25650d7f011960e97;p=AGL%2Fmeta-agl.git

diff --git a/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker_git.bb b/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker_git.bb
index 4873f12a0..fb1cb774f 100644
--- a/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker_git.bb
+++ b/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker_git.bb
@@ -11,12 +11,12 @@ CMAKE_QT5_CLASS = "${@bb.utils.contains('BBFILE_COLLECTIONS','qt5-layer','cmake_
 inherit cmake systemd ${CMAKE_QT5_CLASS}
 
 DEPENDS = "glib-2.0 util-linux sqlite3 boost json-c libtool"
-RDEPENDS_${PN} = "python-misc python-json"
+RDEPENDS_${PN} = "python-misc python-json python-curses"
 
 PACKAGECONFIG ??= " use_gps \
     ${@bb.utils.contains('BBFILE_COLLECTIONS','qt5-layer','use_qt5','', d)} \
     "
-PACKAGECONFIG[use_gps] = "-Dgpsd_plugins=On,,gpsd"
+PACKAGECONFIG[use_gps] = "-Dgpsnmea_plugin=On"
 PACKAGECONFIG[use_qt5] = "-Dqtmainloop=On -Dqt_bindings=On,,qtbase qtdeclarative"
 
 SYSTEMD_PACKAGES = "${PN}"
@@ -30,9 +30,27 @@ EXTRA_OECMAKE += " -Denable_icecc=OFF"
 
 do_install_append() {
     mv ${D}/usr/include/amb/* ${D}/usr/include
+    sed -i 's,/amb,,' ${D}${libdir}/pkgconfig/*.pc
 
     install -d ${D}${systemd_unitdir}/system/
     install -m 0644 ${WORKDIR}/ambd.service ${D}${systemd_unitdir}/system
+
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'use_gps', 'use_gps', '', d)}" = "use_gps" ]; then
+        install -m 0644 ${WORKDIR}/gps ${D}/${sysconfdir}/ambd/plugins.d
+    fi
+
+    # Grmbl - heck gotta fix library installations ?!? WTF !
+    # GO FIX YOUR INSTALLATION ROUTINES PLEASE.  ;)  (jsmoeller)
+    # HACK-ALARM:
+    ls -alh ${D}${libdir}
+    if test -e ${D}${libdir}/libamb-qt.so -a ! -L ${D}${libdir}/libamb-qt.so ; then 
+        mv ${D}${libdir}/libamb-qt.so ${D}${libdir}/libamb-qt.so.0
+        ln -sf libamb-qt.so.0 ${D}${libdir}/libamb-qt.so
+    fi
+    if test -e ${D}${libdir}/libamb-plugins-common.so -a ! -L ${D}${libdir}/libamb-plugins-common.so ; then 
+        mv ${D}${libdir}/libamb-plugins-common.so ${D}${libdir}/libamb-plugins-common.so.0
+        ln -sf libamb-plugins-common.so.0 ${D}${libdir}/libamb-plugins-common.so
+    fi
 }
 
 FILES_${PN} += " ${systemd_unitdir}/ambd.service \