diff options
8 files changed, 28 insertions, 7 deletions
diff --git a/recipes-demo-hmi/agl-service-data-persistence/agl-service-data-persistence_git.bb b/recipes-demo-hmi/agl-service-data-persistence/agl-service-data-persistence_git.bb index 69ebe7a22..488c9ea05 100644 --- a/recipes-demo-hmi/agl-service-data-persistence/agl-service-data-persistence_git.bb +++ b/recipes-demo-hmi/agl-service-data-persistence/agl-service-data-persistence_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/iotbzh/agl-identity" SECTION = "base" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=8089a3c40cff9caffd1b9ba5aa3dfd67" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8089a3c40cff9caffd1b9ba5aa3dfd67" SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/agl-service-data-persistence;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" @@ -11,7 +11,7 @@ SRCREV = "${AGL_APP_REVISION}" inherit cmake aglwgt pkgconfig PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/ll-database-binding" +S = "${WORKDIR}/git" DEPENDS += " af-binder json-c gdbm " diff --git a/recipes-demo-hmi/agl-service-mediascanner/agl-service-mediascanner_git.bb b/recipes-demo-hmi/agl-service-mediascanner/agl-service-mediascanner_git.bb index 3a6d218e6..c1f00015f 100644 --- a/recipes-demo-hmi/agl-service-mediascanner/agl-service-mediascanner_git.bb +++ b/recipes-demo-hmi/agl-service-mediascanner/agl-service-mediascanner_git.bb @@ -12,6 +12,7 @@ SRCREV = "${AGL_APP_REVISION}" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" -DEPENDS = "json-c lightmediascanner" +DEPENDS = "json-c sqlite3" +RDEPENDS_${PN} = "lightmediascanner" inherit cmake aglwgt pkgconfig diff --git a/recipes-demo-hmi/agl-service-weather/agl-service-weather_git.bb b/recipes-demo-hmi/agl-service-weather/agl-service-weather_git.bb new file mode 100644 index 000000000..340bbd7d9 --- /dev/null +++ b/recipes-demo-hmi/agl-service-weather/agl-service-weather_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "Weather Service Binding" +DESCRIPTION = "AGL Weather Service Binding" +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-service-weather" +SECTION = "apps" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" + +SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/agl-service-weather;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "${AGL_APP_REVISION}" + +PV = "1.0+git${SRCPV}" +S = "${WORKDIR}/git" + +DEPENDS = "glib-2.0 json-c" +RDEPENDS_${PN} = "agl-service-geoclue" + +inherit cmake aglwgt pkgconfig diff --git a/recipes-demo-hmi/als-meter-demo/als-meter-demo_git.bb b/recipes-demo-hmi/als-meter-demo/als-meter-demo_git.bb index 955535bdf..866bcce03 100644 --- a/recipes-demo-hmi/als-meter-demo/als-meter-demo_git.bb +++ b/recipes-demo-hmi/als-meter-demo/als-meter-demo_git.bb @@ -13,7 +13,7 @@ PV = "0.1+git${SRCPV}" S = "${WORKDIR}/git" # build-time dependencies -DEPENDS += "qtquickcontrols2 opencv" +DEPENDS += "qtquickcontrols2 opencv virtual/libhomescreen qlibwindowmanager" # runtime dependencies RDEPENDS_${PN} += "agl-service-steering-wheel" diff --git a/recipes-demo-hmi/libqtappfw/libqtappfw_git.bb b/recipes-demo-hmi/libqtappfw/libqtappfw_git.bb index 53519c897..e932b363b 100644 --- a/recipes-demo-hmi/libqtappfw/libqtappfw_git.bb +++ b/recipes-demo-hmi/libqtappfw/libqtappfw_git.bb @@ -13,7 +13,7 @@ DEPENDS += "qtbase qtwebsockets" inherit cmake_qt5 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/libqtappfw;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "112fc8be473f02befc7596750ad7044113f29849" +SRCREV = "${AGL_APP_REVISION}" S = "${WORKDIR}/git/" # PV needs to be modified with SRCPV to work AUTOREV correctly diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb index 07bfc5648..0b37113fe 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb @@ -44,7 +44,8 @@ TTF_FONTS = " \ source-han-sans-tw-fonts \ " -EXTRA_APPS_append = " qtwebengine" +EXTRA_APPS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'qtwebengine', '', d)}" + #EXTRA_APPS_append = " qtsmarthome cinematicexperience qt5everywheredemo qt5-demo-extrafiles" #IMAGE_INSTALL_append = " qtwebengine-examples" diff --git a/templates/feature/agl-demo/50_bblayers.conf.inc b/templates/feature/agl-demo/50_bblayers.conf.inc index 07c20d3aa..a51154d45 100644 --- a/templates/feature/agl-demo/50_bblayers.conf.inc +++ b/templates/feature/agl-demo/50_bblayers.conf.inc @@ -8,5 +8,6 @@ BBLAYERS =+ " \ #------------------------------------------------- BBLAYERS =+ " \ ${METADIR}/meta-qt5 \ + ${METADIR}/meta-gplv2 \ " diff --git a/templates/feature/agl-demo/included.dep b/templates/feature/agl-demo/included.dep index 0eb682b99..2fbc7ce12 100644 --- a/templates/feature/agl-demo/included.dep +++ b/templates/feature/agl-demo/included.dep @@ -1 +1 @@ -agl-appfw-smack agl-devel agl-hmi-framework +agl-appfw-smack agl-hmi-framework |