Code Review
/
AGL
/
meta-agl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
new configuration templates based on fragments
[AGL/meta-agl.git]
/
meta-ivi-common
/
recipes-automotive
/
automotive-message-broker
/
automotive-message-broker_git.bb
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
4873f12
..
dee6f59
100644
(file)
--- 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"
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 \
${@bb.utils.contains('BBFILE_COLLECTIONS','qt5-layer','use_qt5','', d)} \
"
-PACKAGECONFIG[use_gps] = "-Dgps
d_plugins=On,,gpsd
"
+PACKAGECONFIG[use_gps] = "-Dgps
nmea_plugin=On
"
PACKAGECONFIG[use_qt5] = "-Dqtmainloop=On -Dqt_bindings=On,,qtbase qtdeclarative"
SYSTEMD_PACKAGES = "${PN}"
PACKAGECONFIG[use_qt5] = "-Dqtmainloop=On -Dqt_bindings=On,,qtbase qtdeclarative"
SYSTEMD_PACKAGES = "${PN}"
@@
-30,9
+30,14
@@
EXTRA_OECMAKE += " -Denable_icecc=OFF"
do_install_append() {
mv ${D}/usr/include/amb/* ${D}/usr/include
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
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
}
FILES_${PN} += " ${systemd_unitdir}/ambd.service \
}
FILES_${PN} += " ${systemd_unitdir}/ambd.service \