From af902739757f9581473009ad8668fc64cc92e279 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 22 Aug 2016 16:14:35 +0300 Subject: ota: update recipe Use qt5-git.inc to simplify recipe, update revision and license. Change-Id: I7e31e405a980b07767917ba776036f288caccff6 Reviewed-by: Teemu Holappa Reviewed-by: Gatis Paeglis --- recipes-qt/b2qt-addons/b2qt-ota.bb | 42 ---------------------- .../packagegroup-b2qt-automotive-addons.bb | 1 - .../packagegroup-b2qt-embedded-addons.bb | 1 - ...kagegroup-b2qt-embedded-qt5-toolchain-target.bb | 2 +- .../packagegroups/packagegroup-b2qt-qt5-modules.bb | 1 + recipes-qt/qt5/qtotaupdate.bb | 42 ++++++++++++++++++++++ 6 files changed, 44 insertions(+), 45 deletions(-) delete mode 100644 recipes-qt/b2qt-addons/b2qt-ota.bb create mode 100644 recipes-qt/qt5/qtotaupdate.bb diff --git a/recipes-qt/b2qt-addons/b2qt-ota.bb b/recipes-qt/b2qt-addons/b2qt-ota.bb deleted file mode 100644 index 5b00b48..0000000 --- a/recipes-qt/b2qt-addons/b2qt-ota.bb +++ /dev/null @@ -1,42 +0,0 @@ -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -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" - -inherit qt5-module - -SRC_URI = " \ - git://codereview.qt-project.org/qt/qtotaupdate;branch=${BRANCH};protocol=http \ - " - -SRCREV = "d8d81530692454e4e38f682f6a09049d27b8c1ad" -BRANCH = "master" -PV = "git${SRCPV}" - -S = "${WORKDIR}/git" - -DEPENDS = "qtbase qtdeclarative ostree" - 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/qt5/qtotaupdate.bb b/recipes-qt/qt5/qtotaupdate.bb new file mode 100644 index 0000000..9cafd8c --- /dev/null +++ b/recipes-qt/qt5/qtotaupdate.bb @@ -0,0 +1,42 @@ +############################################################################ +## +## 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$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +DESCRIPTION = "Qt OTA Update module" +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 + +QT_GIT = "git://github.com/qt" +QT_MODULE_BRANCH = "master" + +SRCREV = "f48ab751dd43906d5b9492e3f124b94f189b9971" + +DEPENDS = "qtbase qtdeclarative ostree" -- cgit v1.2.3-54-g00ecf