From 3ce50afde6b5f864b385632f514af1d2cff6b90c Mon Sep 17 00:00:00 2001 From: José Bollo Date: Mon, 20 Nov 2017 18:08:29 +0100 Subject: af-binder-devtools: Align to use app-framework-binder repo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The development tools of af-binder are better provided by af-binder itself in the repository app-framework-binder. This is better for support and evolution. Bug-AGL: SPEC-941 Change-Id: Ib283c36bc6194f793fd61c7844191e3187fe3bed Signed-off-by: José Bollo Reviewed-on: https://gerrit.automotivelinux.org/gerrit/12059 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- .../af-binder/af-binder-devtools-native_1.0.bb | 8 +++++++ .../af-binder/af-binder-devtools_1.0.bb | 19 --------------- .../recipes-core/af-binder/af-binder_1.0.bb | 27 ++++++---------------- .../recipes-core/af-binder/af-binder_1.0.inc | 18 +++++++++++++++ .../af-binder/nativesdk-af-binder-devtools_1.0.bb | 8 +++++++ 5 files changed, 41 insertions(+), 39 deletions(-) create mode 100644 meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_1.0.bb delete mode 100644 meta-app-framework/recipes-core/af-binder/af-binder-devtools_1.0.bb create mode 100644 meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc create mode 100644 meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_1.0.bb 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 new file mode 100644 index 000000000..70dafb38c --- /dev/null +++ b/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_1.0.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-devtools_1.0.bb b/meta-app-framework/recipes-core/af-binder/af-binder-devtools_1.0.bb deleted file mode 100644 index d22112f22..000000000 --- a/meta-app-framework/recipes-core/af-binder/af-binder-devtools_1.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "App Framework Host Utilities (generators, parsers)" -DESCRIPTION = "The AGL App Framework Host Utilities are used to compile applications" -HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-host-utilities" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" - -DEPENDS = "json-c" - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-host-utilities;protocol=https;branch=${AGL_BRANCH}" - -SRCREV = "${AGL_DEFAULT_REVISION}" -PV = "${AGL_BRANCH}+git${SRCPV}" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -BBCLASSEXTEND += "native nativesdk" 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 19deb142d..1850e2bd8 100644 --- 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 @@ -1,25 +1,7 @@ -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" +require af-binder_${PV}.inc 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=${AGL_BRANCH}" -SRC_URI_files = "" -SRC_URI = "${SRC_URI_git} \ - ${SRC_URI_files} \ - " - -SRCREV = "f85485a195f304028b6e3a1db4777b59fba692a4" -PV = "master+git${SRCPV}" - -S = "${WORKDIR}/git" - inherit cmake pkgconfig EXTRA_OECMAKE_append_agl-devel = " -DAGL_DEVEL=ON -DINCLUDE_MONITORING=ON" @@ -31,7 +13,7 @@ pkg_postinst_${PN}() { ############################################# # setup package ############################################# -PACKAGES += "${PN}-tools ${PN}-meta" +PACKAGES =+ "${PN}-tools ${PN}-devtools ${PN}-meta" FILES_${PN} += "${datadir}" @@ -41,6 +23,11 @@ ALLOW_EMPTY_${PN}-meta = "1" FILES_${PN}-tools = "\ ${bindir}/afb-client-demo \ +" + +FILES_${PN}-devtools = "\ + ${bindir}/afb-exprefs \ + ${bindir}/afb-json2c \ ${bindir}/afb-genskel \ " 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 new file mode 100644 index 000000000..fca9284fc --- /dev/null +++ b/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc @@ -0,0 +1,18 @@ +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 = "45c8372c2b4137691a38c2a04f4a5759a110f2f7" +PV = "${AGL_BRANCH}+git${SRCPV}" + +S = "${WORKDIR}/git" + +CFLAGS_append_agl-devel = " -DAGL_DEVEL" + 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 new file mode 100644 index 000000000..3223dd05d --- /dev/null +++ b/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_1.0.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