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-intel-extras/classes/image_dd_efi.bbclass | 22 +++++++++++++++------- meta-intel-extras/conf/layer.conf | 22 +++++++++++++++------- .../recipes/grub/grub-efi_2.00.bbappend | 22 +++++++++++++++------- .../recipes/linux/linux-yocto_3.%.bbappend | 22 +++++++++++++++------- .../recipes/recipes-qt/qtbase_git.bbappend | 22 +++++++++++++++------- 5 files changed, 75 insertions(+), 35 deletions(-) (limited to 'meta-intel-extras') diff --git a/meta-intel-extras/classes/image_dd_efi.bbclass b/meta-intel-extras/classes/image_dd_efi.bbclass index 7bbff62..9cb2075 100644 --- a/meta-intel-extras/classes/image_dd_efi.bbclass +++ b/meta-intel-extras/classes/image_dd_efi.bbclass @@ -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$ ## -############################################################################## +############################################################################ DESCRIPTION = "Extends image_dd class to boot via GRUB-EFI and initramfs." LICENSE = "CLOSED" diff --git a/meta-intel-extras/conf/layer.conf b/meta-intel-extras/conf/layer.conf index 3b7be9d..3306ada 100644 --- a/meta-intel-extras/conf/layer.conf +++ b/meta-intel-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-intel-extras/recipes/grub/grub-efi_2.00.bbappend b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend index d002240..8a223fe 100644 --- a/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend +++ b/meta-intel-extras/recipes/grub/grub-efi_2.00.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 += "file://grub.cfg" diff --git a/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend b/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend index 55ac1a2..2879e65 100644 --- a/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend +++ b/meta-intel-extras/recipes/linux/linux-yocto_3.%.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-intel-extras/recipes/recipes-qt/qtbase_git.bbappend b/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend index 2346521..8770c65 100644 --- a/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend +++ b/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend @@ -1,22 +1,30 @@ -############################################################################## +############################################################################ ## ## 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$ ## -############################################################################## +############################################################################ PACKAGECONFIG += "kms" -- cgit v1.2.3-54-g00ecf