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-smx6-extras/conf/layer.conf | 22 +++++++++++++++------- .../recipes/linux/linux-smx6_3.14.28.bbappend | 22 +++++++++++++++------- 2 files changed, 30 insertions(+), 14 deletions(-) (limited to 'meta-smx6-extras') diff --git a/meta-smx6-extras/conf/layer.conf b/meta-smx6-extras/conf/layer.conf index 097fefe..566fb41 100644 --- a/meta-smx6-extras/conf/layer.conf +++ b/meta-smx6-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-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend index 4f05ca1..ea88489 100644 --- a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend +++ b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.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 += " \ -- cgit v1.2.3-54-g00ecf