af-binder: Bug fixes and improvements

[AGL/meta-agl.git] / meta-app-framework / recipes-core / af-binder / af-binder_1.0.bb

diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb b/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb
index cb1d53e..cc078fa 100644 (file)
--- a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb
+++ b/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb
@@ -7,31 +7,45 @@ HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-f
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-DEPENDS = "file json-c libmicrohttpd systemd util-linux openssl"
+DEPENDS = "file json-c libmicrohttpd systemd util-linux openssl cynara"
 
-SRC_URI_git = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-binder;protocol=https;branch=master"
+SRC_URI_git = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-binder;protocol=https;branch=${AGL_BRANCH}"
 SRC_URI_files = ""
 SRC_URI = "${SRC_URI_git} \
            ${SRC_URI_files} \
           "
 
-SRCREV = "2db7c92c0b4f5840884481fa4c95facbdea63bb6"
+SRCREV = "b6a483aab99a4bf32d7c04b159de7fcb96a54416"
+PV = "master+git${SRCPV}"
+
 S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
-FILES_${PN} += "${datadir}"
+EXTRA_OECMAKE_append_agl-devel = " -DAGL_DEVEL=ON -DINCLUDE_MONITORING=ON"
 
 pkg_postinst_${PN}() {
        mkdir -p "$D${libdir}/afb"
 }
 
 #############################################
-# setup meta package
+# setup package
 #############################################
-PACKAGES += "${PN}-meta"
+PACKAGES += "${PN}-tools ${PN}-meta"
+
+FILES_${PN} += "${datadir}"
+
+FILES_${PN}_append_agl-devel = " ${libdir}/afb/monitoring"
+
 ALLOW_EMPTY_${PN}-meta = "1"
 
+FILES_${PN}-tools = "\
+       ${bindir}/afb-client-demo \
+       ${bindir}/afb-genskel \
+"
+
+RDEPENDS_${PN}-dev += "libafbwsc-dev"
+
 #############################################
 # setup sample binding packages
 #############################################
@@ -64,7 +78,6 @@ FILES_libafbwsc = "\
 FILES_libafbwsc-dev = "\
        ${includedir}/afb/afb-wsj1.h \
        ${includedir}/afb/afb-ws-client.h \
-       ${bindir}/afb-client-demo \
        ${libdir}/libafbwsc.so \
        ${libdir}/pkgconfig/libafbwsc.pc \
 "
@@ -74,5 +87,4 @@ FILES_libafbwsc-dbg = "\
 "
 RDEPENDS_libafbwsc-dbg += "${PN}-dbg libafbwsc-dev"
 
-RDEPENDS_${PN}-dev += "libafbwsc-dev"