From 494e4fa32427230954f301cc0e8f6e7cdab4654e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 4 Jun 2018 13:07:26 +0300 Subject: Update Qt license agreement Include the latest Qt License Agreement version 4.0, as it's available in qtbase. Use the same filename as used in meta-qt5 layer, so this license will be used in all Qt recipes that use The-Qt-Company-Commercial license. Change-Id: Ic02eb2c6c6d210ad30ee6a65d23afaa5b8b68589 Reviewed-by: Jani Heikkinen --- .../nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | 2 +- .../recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb | 2 +- .../packagegroups/packagegroup-b2qt-embedded-gstreamer.bb | 2 +- .../packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb | 2 +- .../recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb | 2 +- meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb | 4 ++-- meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb | 2 +- meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb | 4 ++-- meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb | 4 ++-- meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb | 4 ++-- .../recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb | 4 ++-- .../recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb | 4 ++-- .../nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb | 2 +- .../nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb | 2 +- .../recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb | 2 +- .../packagegroup-b2qt-automotive-qt5-toolchain-target.bb | 2 +- .../recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb | 2 +- .../packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 2 +- .../recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) (limited to 'meta-boot2qt-distro') diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index 9f43fff..21552d7 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -29,7 +29,7 @@ DESCRIPTION = "Host packages for B2Qt on embedded Linux SDK" PR = "r0" -LICENSE = "The-Qt-Company-DCLA-2.1" +LICENSE = "The-Qt-Company-Commercial" inherit nativesdk packagegroup diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb index b6573e2..3dbda88 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bb @@ -28,7 +28,7 @@ ############################################################################ DESCRIPTION = "Packagegroup for B2Qt embedded Linux image" -LICENSE = "The-Qt-Company-DCLA-2.1" +LICENSE = "The-Qt-Company-Commercial" PR = "r0" inherit packagegroup diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb index b1bec0e..39e492a 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer.bb @@ -28,7 +28,7 @@ ############################################################################ DESCRIPTION = "Additional gstreamer packagegroup for B2Qt embedded Linux image" -LICENSE = "The-Qt-Company-DCLA-2.1" +LICENSE = "The-Qt-Company-Commercial" PR = "r0" inherit packagegroup diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb index af291c7..29914a7 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb @@ -28,7 +28,7 @@ ############################################################################ DESCRIPTION = "Additional gstreamer packagegroup for B2Qt embedded Linux image" -LICENSE = "The-Qt-Company-DCLA-2.1" +LICENSE = "The-Qt-Company-Commercial" PR = "r0" inherit packagegroup diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb index 4a5fa39..7dd1604 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb @@ -28,7 +28,7 @@ ############################################################################ DESCRIPTION = "Additional tools packagegroup for B2Qt embedded Linux image" -LICENSE = "The-Qt-Company-DCLA-2.1" +LICENSE = "The-Qt-Company-Commercial" PR = "r0" inherit packagegroup diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb index d0bdb16..b9c5fd0 100644 --- a/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb @@ -28,8 +28,8 @@ ############################################################################ DESCRIPTION = "B2Qt Automotive Qt5 image" -LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" +LICENSE = "The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" DEPLOY_CONF_TYPE = "Qt Automotive Suite $QT_VERSION" diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb index 32773e1..1afeb7e 100644 --- a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb @@ -28,7 +28,7 @@ ############################################################################ DESCRIPTION = "B2Qt on embedded Linux SDK image" -LICENSE = "The-Qt-Company-DCLA-2.1" +LICENSE = "The-Qt-Company-Commercial" PR = "r0" IMAGE_FEATURES += "\ diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb index fa93851..4c58a00 100644 --- a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb @@ -28,8 +28,8 @@ ############################################################################ DESCRIPTION = "B2Qt embedded Qt5 image" -LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" +LICENSE = "The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" PR = "r0" DEPLOY_CONF_TYPE = "Boot2Qt $QT_VERSION" diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb index 5595cc6..73a5078 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb @@ -29,8 +29,8 @@ DESCRIPTION = "Meta task for QBSP creation" -LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" +LICENSE = "The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" # get Qt version number require recipes-qt/qt5/qt5-git.inc diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb index dc2873f..1d64011 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb @@ -29,8 +29,8 @@ DESCRIPTION = "Meta task for QBSP creation" -LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" +LICENSE = "The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" # get Qt version number require recipes-qt/qt5/qt5-git.inc diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb index 94bf48d..11ce786 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb @@ -29,8 +29,8 @@ DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain" -LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" +LICENSE = "The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" inherit populate_b2qt_qt5_sdk diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb index 65354ad..6841cdb 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb @@ -29,8 +29,8 @@ DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain" -LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" +LICENSE = "The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" inherit populate_b2qt_qt5_sdk diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb index 7ce53c6..8c4adaa 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb @@ -28,7 +28,7 @@ ############################################################################ DESCRIPTION = "Host packages for B2Qt automotive Qt5 SDK" -LICENSE = "The-Qt-Company-DCLA-2.1" +LICENSE = "The-Qt-Company-Commercial" PR = "r0" inherit nativesdk packagegroup diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb index 10607e3..9f2d197 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb @@ -28,7 +28,7 @@ ############################################################################ DESCRIPTION = "Host packages for B2Qt embedded Qt5 SDK" -LICENSE = "The-Qt-Company-DCLA-2.1" +LICENSE = "The-Qt-Company-Commercial" PR = "r0" inherit nativesdk packagegroup diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb index 9fe3827..078763a 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb @@ -28,7 +28,7 @@ ############################################################################ DESCRIPTION = "Automotive specific Qt packages" -LICENSE = "The-Qt-Company-DCLA-2.1" +LICENSE = "The-Qt-Company-Commercial" inherit packagegroup diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb index 6ae1ef4..3b64622 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb @@ -28,7 +28,7 @@ ############################################################################ DESCRIPTION = "Target packages for B2Qt Automotive Qt5 SDK" -LICENSE = "The-Qt-Company-DCLA-2.1" +LICENSE = "The-Qt-Company-Commercial" PR = "r0" inherit packagegroup diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb index 345fbaa..2e46a32 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb @@ -28,7 +28,7 @@ ############################################################################ DESCRIPTION = "Device Creation specific Qt packages" -LICENSE = "The-Qt-Company-DCLA-2.1" +LICENSE = "The-Qt-Company-Commercial" inherit packagegroup diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index fa21738..646239f 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -28,7 +28,7 @@ ############################################################################ DESCRIPTION = "Target packages for B2Qt embedded Qt5 SDK" -LICENSE = "The-Qt-Company-DCLA-2.1" +LICENSE = "The-Qt-Company-Commercial" PR = "r0" inherit packagegroup diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index ba20618..cd5f35f 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb @@ -28,7 +28,7 @@ ############################################################################ DESCRIPTION = "Qt5 modules" -LICENSE = "The-Qt-Company-DCLA-2.1" +LICENSE = "The-Qt-Company-Commercial" inherit packagegroup -- cgit v1.2.3-54-g00ecf