From edc4f9274cc129d3550a0249c4e500db7f81a9af Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 11 May 2016 13:33:48 +0300 Subject: Update license headers License changed to GPLv3 + Commercial Change-Id: I267c97216e717ed29071df064337e1bcf83de973 Reviewed-by: Kalle Viironen --- meta-ti-extras/conf/layer.conf | 22 +++++++++++++++------- .../libgles/libgles-omap3_4.09.00.01.bbappend | 22 +++++++++++++++------- .../libgles/libgles-omap3_5.01.01.01.bbappend | 22 +++++++++++++++------- .../recipes/linux/linux-ti-staging_3.14.bbappend | 22 +++++++++++++++------- .../u-boot/u-boot-am33x_2013.01.01.bbappend | 22 +++++++++++++++------- .../u-boot/u-boot-ti-staging_2013.10.bbappend | 22 +++++++++++++++------- 6 files changed, 90 insertions(+), 42 deletions(-) (limited to 'meta-ti-extras') diff --git a/meta-ti-extras/conf/layer.conf b/meta-ti-extras/conf/layer.conf index 80fba29..44583e9 100644 --- a/meta-ti-extras/conf/layer.conf +++ b/meta-ti-extras/conf/layer.conf @@ -1,23 +1,31 @@ -############################################################################## +############################################################################ ## ## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. ## -## $QT_BEGIN_LICENSE:COMM$ -## +## $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 http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. +## 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$ ## -############################################################################## +############################################################################ # We have a conf and classes directory, append to BBPATH BBPATH .= ":${LAYERDIR}" diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend index 3f5d3cb..3d909f9 100644 --- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend +++ b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend @@ -1,23 +1,31 @@ -############################################################################## +############################################################################ ## ## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. ## -## $QT_BEGIN_LICENSE:COMM$ -## +## $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 http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. +## 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$ ## -############################################################################## +############################################################################ BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend index e26f67f..0d557ce 100644 --- a/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend +++ b/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend @@ -1,23 +1,31 @@ -############################################################################## +############################################################################ ## ## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. ## -## $QT_BEGIN_LICENSE:COMM$ -## +## $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 http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. +## 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$ ## -############################################################################## +############################################################################ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend index 49f8f58..54dca0f 100644 --- a/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend +++ b/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend @@ -1,23 +1,31 @@ -############################################################################## +############################################################################ ## ## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. ## -## $QT_BEGIN_LICENSE:COMM$ -## +## $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 http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. +## 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$ ## -############################################################################## +############################################################################ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "\ diff --git a/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend b/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend index e15ecf2..a9c3c0d 100644 --- a/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend +++ b/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend @@ -1,23 +1,31 @@ -############################################################################## +############################################################################ ## ## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. ## -## $QT_BEGIN_LICENSE:COMM$ -## +## $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 http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. +## 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$ ## -############################################################################## +############################################################################ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ diff --git a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend index ca0b2ea..b638ddc 100644 --- a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend +++ b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend @@ -1,23 +1,31 @@ -############################################################################## +############################################################################ ## ## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. ## -## $QT_BEGIN_LICENSE:COMM$ -## +## $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 http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. +## 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$ ## -############################################################################## +############################################################################ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ -- cgit v1.2.3-54-g00ecf