ota: update recipe

Use qt5-git.inc to simplify recipe, update revision and license.

Change-Id: I7e31e405a980b07767917ba776036f288caccff6
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>

5 files changed, 13 insertions, 14 deletions

diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index 5ec66b4..25a567d 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -37,7 +37,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS_${PN} += " \
     b2qt-appcontroller \
     b2qt-utils \
-    b2qt-ota \
     qtivi \
     neptune-ui \
     neptune-ui-apps \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index ff2d206..9c2008d 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -37,7 +37,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS_${PN} += " \
     b2qt-appcontroller \
     b2qt-utils \
-    b2qt-ota \
     b2qt-launcher \
     b2qt-demos \
     ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index 5286ac5..652c931 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -53,6 +53,7 @@ RDEPENDS_${PN} += " \
     qtimageformats-dev \
     qtlocation-dev \
     qtmultimedia-dev \
+    qtotaupdate-dev \
     qtquickcontrols-dev \
     qtquickcontrols2-dev \
     qtsensors-dev \
@@ -68,7 +69,6 @@ RDEPENDS_${PN} += " \
     qtxmlpatterns-dev \
     \
     b2qt-utils-dev \
-    b2qt-ota-dev \
     qtcharts-dev \
     qtdatavis3d-dev \
     qtvirtualkeyboard-dev \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 06de528..8138b3e 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -48,6 +48,7 @@ RDEPENDS_${PN} += " \
     qtimageformats \
     qtlocation \
     qtmultimedia \
+    qtotaupdate \
     qtquickcontrols \
     qtquickcontrols2 \
     qtsensors \
diff --git a/recipes-qt/b2qt-addons/b2qt-ota.bb b/recipes-qt/qt5/qtotaupdate.bb
index 5b00b48..9cafd8c 100644
--- a/recipes-qt/b2qt-addons/b2qt-ota.bb
+++ b/recipes-qt/qt5/qtotaupdate.bb
@@ -1,3 +1,8 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
 ## This file is part of the Boot to Qt meta layer.
 ##
 ## $QT_BEGIN_LICENSE:GPL$
@@ -23,20 +28,15 @@
 ############################################################################
 
 DESCRIPTION = "Qt OTA Update module"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://src/lib/qotaclient.h;md5=da66cc6e520f8151501c0f6c11480077;beginline=1;endline=28"
+LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qt5-module
+require recipes-qt/qt5/qt5-git.inc
 
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/qtotaupdate;branch=${BRANCH};protocol=http \
-    "
+QT_GIT = "git://github.com/qt"
+QT_MODULE_BRANCH = "master"
 
-SRCREV = "d8d81530692454e4e38f682f6a09049d27b8c1ad"
-BRANCH = "master"
-PV = "git${SRCPV}"
-
-S = "${WORKDIR}/git"
+SRCREV = "f48ab751dd43906d5b9492e3f124b94f189b9971"
 
 DEPENDS = "qtbase qtdeclarative ostree"
-