From 481b5cdfef7e4c90a0a062e4b087bff32000b19a Mon Sep 17 00:00:00 2001 From: Jose Bollo Date: Mon, 10 Sep 2018 14:13:41 +0200 Subject: af-main & af-binder: Version Funky Flounder Change-Id: Ie1ff83f007d9d8d819829540d51e576f088c97eb Signed-off-by: Jose Bollo --- .../af-binder/af-binder-devtools-native_1.0.bb | 8 -- .../af-binder/af-binder-devtools-native_git.bb | 8 ++ .../recipes-core/af-binder/af-binder_1.0.bb | 92 ---------------------- .../recipes-core/af-binder/af-binder_1.0.inc | 17 ---- .../recipes-core/af-binder/af-binder_git.bb | 92 ++++++++++++++++++++++ .../recipes-core/af-binder/af-binder_git.inc | 22 ++++++ .../af-binder/nativesdk-af-binder-devtools_1.0.bb | 8 -- .../af-binder/nativesdk-af-binder-devtools_git.bb | 8 ++ 8 files changed, 130 insertions(+), 125 deletions(-) delete mode 100644 meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_1.0.bb create mode 100644 meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb delete mode 100644 meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb delete mode 100644 meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc create mode 100644 meta-app-framework/recipes-core/af-binder/af-binder_git.bb create mode 100644 meta-app-framework/recipes-core/af-binder/af-binder_git.inc delete mode 100644 meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_1.0.bb create mode 100644 meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb (limited to 'meta-app-framework/recipes-core/af-binder') diff --git a/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_1.0.bb b/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_1.0.bb deleted file mode 100644 index 70dafb38c..000000000 --- a/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_1.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require af-binder_${PV}.inc - -DEPENDS = "json-c-native" - -inherit cmake pkgconfig native - -EXTRA_OECMAKE_append = " -DONLY_DEVTOOLS=TRUE" - diff --git a/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb b/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb new file mode 100644 index 000000000..70dafb38c --- /dev/null +++ b/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb @@ -0,0 +1,8 @@ +require af-binder_${PV}.inc + +DEPENDS = "json-c-native" + +inherit cmake pkgconfig native + +EXTRA_OECMAKE_append = " -DONLY_DEVTOOLS=TRUE" + 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 deleted file mode 100644 index 91f26b894..000000000 --- a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb +++ /dev/null @@ -1,92 +0,0 @@ -require af-binder_${PV}.inc - -DEPENDS = "file json-c libmicrohttpd systemd util-linux openssl cynara" - -inherit cmake pkgconfig - -EXTRA_OECMAKE_append_class-target = "\ - -DUNITDIR_SYSTEM=${systemd_system_unitdir} \ -" - -EXTRA_OECMAKE_append_agl-devel = " \ - -DAGL_DEVEL=ON \ - -DINCLUDE_MONITORING=ON \ - -DINCLUDE_SUPERVISOR=ON -DAFS_SURPERVISION_SOCKET=/run/platform/supervisor \ -" - -pkg_postinst_${PN}() { - mkdir -p "$D${libdir}/afb" -} - -do_install_append_agl-devel_class-target() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d -m 0755 ${D}${systemd_system_unitdir}/multi-user.target.wants - ln -s ../afs-supervisor.service ${D}${systemd_system_unitdir}/multi-user.target.wants/afs-supervisor.service - fi -} - -############################################# -# setup package -############################################# -PACKAGES =+ "${PN}-tools ${PN}-devtools ${PN}-meta" - -FILES_${PN} += "${datadir}" - -FILES_${PN}_append_agl-devel = " ${libdir}/afb/monitoring ${systemd_system_unitdir}" - -ALLOW_EMPTY_${PN}-meta = "1" - -FILES_${PN}-tools = "\ - ${bindir}/afb-client-demo \ -" - -FILES_${PN}-devtools = "\ - ${bindir}/afb-exprefs \ - ${bindir}/afb-json2c \ - ${bindir}/afb-genskel \ -" - -RDEPENDS_${PN}-dev += "libafbwsc-dev" - -############################################# -# setup sample binding packages -############################################# -PACKAGES_DYNAMIC = "${PN}-binding-*" - -python populate_packages_prepend () { - afb_libdir = d.expand('${libdir}/afb') - postinst = d.getVar('binding_postinst', True) - pkgs = [] - pkgs_dbg = [] - - pkgs += do_split_packages(d, afb_libdir, '(.*)-api\.so$', d.expand('${PN}-binding-%s'), 'AFB binding for %s', postinst=postinst, extra_depends=d.expand('${PN}')) - pkgs += do_split_packages(d, afb_libdir, '(.*(?!-api))\.so$', d.expand('${PN}-binding-%s'), 'AFB binding for %s', postinst=postinst, extra_depends=d.expand('${PN}')) - - pkgs_dbg += do_split_packages(d, oe.path.join(afb_libdir, ".debug"), '(.*)-api\.so$', d.expand('${PN}-binding-%s-dbg'), 'AFB binding for %s, debug info', postinst=postinst, extra_depends=d.expand('${PN}')) - pkgs_dbg += do_split_packages(d, oe.path.join(afb_libdir, ".debug"), '(.*(?!-api))\.so$', d.expand('${PN}-binding-%s-dbg'), 'AFB binding for %s, debug info', postinst=postinst, extra_depends=d.expand('${PN}')) - - metapkg = d.getVar('PN', True) + '-meta' - d.setVar('RDEPENDS_' + metapkg, ' '.join(pkgs)) -} - -############################################# -# setup libafbwsc package -############################################# -PACKAGES =+ "libafbwsc libafbwsc-dev libafbwsc-dbg" - -FILES_libafbwsc = "\ - ${libdir}/libafbwsc.so.* \ -" -FILES_libafbwsc-dev = "\ - ${includedir}/afb/afb-wsj1.h \ - ${includedir}/afb/afb-ws-client.h \ - ${libdir}/libafbwsc.so \ - ${libdir}/pkgconfig/libafbwsc.pc \ -" -FILES_libafbwsc-dbg = "\ - ${libdir}/.debug/libafbwsc.so.* \ - ${bindir}/.debug/afb-client-demo \ -" -RDEPENDS_libafbwsc-dbg += "${PN}-dbg libafbwsc-dev" - - diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc b/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc deleted file mode 100644 index cca794db7..000000000 --- a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "HTTP REST interface to automotive backends for HTML5 UI support" -DESCRIPTION = "Automotive-Framework-Binder Daemon provides a HTTP REST \ -interface to various automotive-oriented bindings, \ -allowing HTML5 UIs to send platform-specific requests in a secure way." - -HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-binder" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-binder;protocol=https;branch=${AGL_BRANCH}" - -SRCREV = "29f544ba5fa53407575b549c1d3b0a4e2619af8f" -PV = "${AGL_BRANCH}+git${SRCPV}" - -S = "${WORKDIR}/git" - -CFLAGS_append_agl-devel = " -DAGL_DEVEL" diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_git.bb b/meta-app-framework/recipes-core/af-binder/af-binder_git.bb new file mode 100644 index 000000000..91f26b894 --- /dev/null +++ b/meta-app-framework/recipes-core/af-binder/af-binder_git.bb @@ -0,0 +1,92 @@ +require af-binder_${PV}.inc + +DEPENDS = "file json-c libmicrohttpd systemd util-linux openssl cynara" + +inherit cmake pkgconfig + +EXTRA_OECMAKE_append_class-target = "\ + -DUNITDIR_SYSTEM=${systemd_system_unitdir} \ +" + +EXTRA_OECMAKE_append_agl-devel = " \ + -DAGL_DEVEL=ON \ + -DINCLUDE_MONITORING=ON \ + -DINCLUDE_SUPERVISOR=ON -DAFS_SURPERVISION_SOCKET=/run/platform/supervisor \ +" + +pkg_postinst_${PN}() { + mkdir -p "$D${libdir}/afb" +} + +do_install_append_agl-devel_class-target() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d -m 0755 ${D}${systemd_system_unitdir}/multi-user.target.wants + ln -s ../afs-supervisor.service ${D}${systemd_system_unitdir}/multi-user.target.wants/afs-supervisor.service + fi +} + +############################################# +# setup package +############################################# +PACKAGES =+ "${PN}-tools ${PN}-devtools ${PN}-meta" + +FILES_${PN} += "${datadir}" + +FILES_${PN}_append_agl-devel = " ${libdir}/afb/monitoring ${systemd_system_unitdir}" + +ALLOW_EMPTY_${PN}-meta = "1" + +FILES_${PN}-tools = "\ + ${bindir}/afb-client-demo \ +" + +FILES_${PN}-devtools = "\ + ${bindir}/afb-exprefs \ + ${bindir}/afb-json2c \ + ${bindir}/afb-genskel \ +" + +RDEPENDS_${PN}-dev += "libafbwsc-dev" + +############################################# +# setup sample binding packages +############################################# +PACKAGES_DYNAMIC = "${PN}-binding-*" + +python populate_packages_prepend () { + afb_libdir = d.expand('${libdir}/afb') + postinst = d.getVar('binding_postinst', True) + pkgs = [] + pkgs_dbg = [] + + pkgs += do_split_packages(d, afb_libdir, '(.*)-api\.so$', d.expand('${PN}-binding-%s'), 'AFB binding for %s', postinst=postinst, extra_depends=d.expand('${PN}')) + pkgs += do_split_packages(d, afb_libdir, '(.*(?!-api))\.so$', d.expand('${PN}-binding-%s'), 'AFB binding for %s', postinst=postinst, extra_depends=d.expand('${PN}')) + + pkgs_dbg += do_split_packages(d, oe.path.join(afb_libdir, ".debug"), '(.*)-api\.so$', d.expand('${PN}-binding-%s-dbg'), 'AFB binding for %s, debug info', postinst=postinst, extra_depends=d.expand('${PN}')) + pkgs_dbg += do_split_packages(d, oe.path.join(afb_libdir, ".debug"), '(.*(?!-api))\.so$', d.expand('${PN}-binding-%s-dbg'), 'AFB binding for %s, debug info', postinst=postinst, extra_depends=d.expand('${PN}')) + + metapkg = d.getVar('PN', True) + '-meta' + d.setVar('RDEPENDS_' + metapkg, ' '.join(pkgs)) +} + +############################################# +# setup libafbwsc package +############################################# +PACKAGES =+ "libafbwsc libafbwsc-dev libafbwsc-dbg" + +FILES_libafbwsc = "\ + ${libdir}/libafbwsc.so.* \ +" +FILES_libafbwsc-dev = "\ + ${includedir}/afb/afb-wsj1.h \ + ${includedir}/afb/afb-ws-client.h \ + ${libdir}/libafbwsc.so \ + ${libdir}/pkgconfig/libafbwsc.pc \ +" +FILES_libafbwsc-dbg = "\ + ${libdir}/.debug/libafbwsc.so.* \ + ${bindir}/.debug/afb-client-demo \ +" +RDEPENDS_libafbwsc-dbg += "${PN}-dbg libafbwsc-dev" + + diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_git.inc b/meta-app-framework/recipes-core/af-binder/af-binder_git.inc new file mode 100644 index 000000000..7f44d6b9b --- /dev/null +++ b/meta-app-framework/recipes-core/af-binder/af-binder_git.inc @@ -0,0 +1,22 @@ +SUMMARY = "HTTP REST interface to automotive backends for HTML5 UI support" +DESCRIPTION = "Automotive-Framework-Binder Daemon provides a HTTP REST \ +interface to various automotive-oriented bindings, \ +allowing HTML5 UIs to send platform-specific requests in a secure way." + +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-binder" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-binder;protocol=https;branch=${AGL_BRANCH}" + +SRCREV = "${AGL_APP_REVISION}" +PV = "${AGL_BRANCH}+git${SRCPV}" + +S = "${WORKDIR}/git" + +CFLAGS_append_agl-devel = " -DAGL_DEVEL" + +EXTRA_OECMAKE_append = "\ + -DAGLVERSION=${AGLVERSION} \ +" + diff --git a/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_1.0.bb b/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_1.0.bb deleted file mode 100644 index 3223dd05d..000000000 --- a/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_1.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require af-binder_${PV}.inc - -DEPENDS = "nativesdk-json-c" - -inherit cmake pkgconfig nativesdk - -EXTRA_OECMAKE_append = " -DONLY_DEVTOOLS=TRUE" - diff --git a/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb b/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb new file mode 100644 index 000000000..3223dd05d --- /dev/null +++ b/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb @@ -0,0 +1,8 @@ +require af-binder_${PV}.inc + +DEPENDS = "nativesdk-json-c" + +inherit cmake pkgconfig nativesdk + +EXTRA_OECMAKE_append = " -DONLY_DEVTOOLS=TRUE" + -- cgit 1.2.3-korg