Skip to content

Commit

Permalink
Add Qt for Device Creation license
Browse files Browse the repository at this point in the history
Replace CLOSED and QtEnteprise licenses with the Qt for Device Creation
license on all recipes.

Change-Id: I02fddc0ee4375bddf18a6c1f7ab093462a5f5153
Reviewed-by: Kalle Viironen <[email protected]>
  • Loading branch information
sapiippo committed Jun 7, 2016
1 parent 2cafe6b commit fe3817d
Show file tree
Hide file tree
Showing 39 changed files with 339 additions and 748 deletions.
2 changes: 1 addition & 1 deletion conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ BBFILE_PATTERN_b2qt := "^${LAYERDIR}/"
BBFILE_PRIORITY_b2qt = "20"

LICENSE_PATH += "${LAYERDIR}/licenses"
QT_LICENCE = "${LAYERDIR}/licenses/QtEnterprise"
QT_LICENSE = "${LAYERDIR}/licenses/The-Qt-Company-DCLA-2.1"
B2QTBASE = "${LAYERDIR}"
706 changes: 0 additions & 706 deletions licenses/QtEnterprise

This file was deleted.

290 changes: 290 additions & 0 deletions licenses/The-Qt-Company-DCLA-2.1

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
############################################################################

DESCRIPTION = "U-Boot script to start up BeagleBone Black"
LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
PR = "r0"

COMPATIBLE_MACHINE = "(beaglebone)"
Expand Down
3 changes: 2 additions & 1 deletion meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
##
############################################################################

LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
DEPENDS = "u-boot-mkimage-native"

PV = "v2.3"
Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/b2qt-addons/b2qt-appcontroller.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Boot to Qt Appcontroller"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17"

inherit qmake5 sdk-sources
Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/b2qt-addons/b2qt-demos.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Boot to Qt Demos"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginline=1;endline=49"

inherit qmake5 sdk-sources
Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Proxy daemon for QtSimulator"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://proxy.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17"

inherit qmake5
Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "SD-Card mount daemon for Emulator"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://sdcardmountd.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17"

inherit qmake5
Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Virtual input plugin for QtSimulator"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://qvinput.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17"

inherit qt5-module
Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/b2qt-addons/b2qt-launcher.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Boot to Qt Demo Launcher"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://src/main.cpp;md5=9320b0d61b46bdd5f27afcc40a0ad77f;beginline=1;endline=17"

inherit qmake5 sdk-sources
Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/b2qt-addons/b2qt-utils.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Boot to Qt Utils module"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://src/bluetoothsettings/bluetoothdevice.h;md5=f1bb87e7d92738d5c1cc8492a7c03e9a;beginline=1;endline=35"

inherit qt5-module sdk-sources
Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/b2qt-addons/democompositor_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Boot to Qt Wayland Demo Compositor"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://main.cpp;md5=9fab217254862959183461343b99a1ab;beginline=1;endline=39"

inherit qmake5 sdk-sources
Expand Down
4 changes: 2 additions & 2 deletions recipes-qt/images/b2qt-automotive-qt5-image.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
############################################################################

DESCRIPTION = "B2Qt Automotive Qt5 image"
LICENSE = "QtEnterprise"
LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
PR = "r0"

DEPLOY_CONF_TYPE = "Automotive"
Expand Down
4 changes: 2 additions & 2 deletions recipes-qt/images/b2qt-embedded-qt5-image.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
############################################################################

DESCRIPTION = "B2Qt embedded Qt5 image"
LICENSE = "QtEnterprise"
LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
PR = "r0"

DEPLOY_CONF_TYPE = "Boot2Qt"
Expand Down
4 changes: 2 additions & 2 deletions recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"

LICENSE = "QtEnterprise"
LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"

inherit populate_b2qt_qt5_sdk

Expand Down
4 changes: 2 additions & 2 deletions recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"

LICENSE = "QtEnterprise"
LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"

inherit populate_b2qt_qt5_sdk

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Host packages for B2Qt embedded Qt5 SDK"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
PR = "r0"

inherit nativesdk packagegroup qtquickcompiler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Automotive specific Qt packages"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"

inherit packagegroup

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Target packages for B2Qt Automotive Qt5 SDK"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
PR = "r0"

inherit packagegroup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Device Creation specific Qt packages"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"

inherit packagegroup

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Target packages for B2Qt embedded Qt5 SDK"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
PR = "r0"

inherit packagegroup qtquickcompiler
Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Qt5 modules"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"

inherit packagegroup

Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/qt5-addons/qtglesstream.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "QtGlesStream"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=e95d9351d26ed899188e02d44133cae0"

inherit qt5-module
Expand Down
4 changes: 2 additions & 2 deletions recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
############################################################################

DESCRIPTION = "Qt Quick Compiler using prebuilt binaries from Qt SDK"
LICENSE = "QtEnterprise"
LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"

inherit allarch qmake5_paths

Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/qt5-addons/qtquickcompiler_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Qt Quick Compiler"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=02f6307ab0d6c4bd38a1540f16ea705d;beginline=1;endline=17"

inherit qt5-module
Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/qt5-addons/qtsimulator_1.0.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "QtSimulator"
LICENSE = "QtEnterprise"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://src/simulator/version.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17"

inherit qt5-module
Expand Down
2 changes: 1 addition & 1 deletion recipes/images/b2qt-embedded-image.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "B2Qt on embedded Linux SDK image"
LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"
PR = "r0"

IMAGE_FEATURES += "\
Expand Down
3 changes: 2 additions & 1 deletion recipes/initramfs-basic/init-basic.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
############################################################################

SUMMARY = "Simple init script that mounts root filesystem by label."
LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
SRC_URI = "file://init.sh"

S = "${WORKDIR}"
Expand Down
3 changes: 2 additions & 1 deletion recipes/initramfs-basic/initramfs-basic.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
############################################################################

DESCRIPTION = "Basic initramfs image. Useful as a template for more advanced functionality."
LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"

# findfs from busybox fails to do its jobs, the full version from util-linux-findfs works fine
PACKAGE_INSTALL = "init-basic busybox util-linux-findfs ${ROOTFS_BOOTSTRAP_INSTALL}"
Expand Down
3 changes: 2 additions & 1 deletion recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@

DESCRIPTION = "B2Qt on embedded Linux SDK toolchain"
PR = "r0"
LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"

inherit populate_b2qt_sdk

Expand Down
3 changes: 2 additions & 1 deletion recipes/opengldummy/opengldummy.bb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@

DESCRIPTION = "OpenGL dummy library provides headers and a dummy library for EGL/GLES"
SECTION = "devel"
LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"

PV = "1.0.0"

Expand Down
3 changes: 2 additions & 1 deletion recipes/opengldummy/qtglesstream-dummy-client.bb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@

DESCRIPTION = "QtGlesStream dummy client provides headers and a dummy library for EGL/GLES"
SECTION = "devel"
LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"

PV = "1.0.0"
SOLIBMAJOR = "1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

DESCRIPTION = "Host packages for B2Qt on embedded Linux SDK"
PR = "r0"
LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"

inherit nativesdk packagegroup

Expand Down
2 changes: 1 addition & 1 deletion recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Packagegroup for B2Qt embedded Linux image"
LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"
PR = "r0"

inherit packagegroup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Additional gstreamer packagegroup for B2Qt embedded Linux image"
LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"
PR = "r0"

inherit packagegroup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Additional gstreamer packagegroup for B2Qt embedded Linux image"
LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"
PR = "r0"

inherit packagegroup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

DESCRIPTION = "Target packages for B2Qt on embedded Linux SDK"
PR = "r0"
LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"

inherit packagegroup
inherit bluetooth
Expand Down
2 changes: 1 addition & 1 deletion recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
############################################################################

DESCRIPTION = "Additional tools packagegroup for B2Qt embedded Linux image"
LICENSE = "CLOSED"
LICENSE = "The-Qt-Company-DCLA-2.1"
PR = "r0"

inherit packagegroup
Expand Down

0 comments on commit fe3817d

Please sign in to comment.