diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-05-11 13:33:48 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-05-18 09:31:21 +0000 |
commit | edc4f9274cc129d3550a0249c4e500db7f81a9af (patch) | |
tree | 5f784c522191e10cd636c8bbb2b9293a0a609773 /meta-vib4-extras | |
parent | 1944b64469213b64da7b4faec442ea36a43f24a4 (diff) | |
download | meta-boot2qt-edc4f9274cc129d3550a0249c4e500db7f81a9af.tar.gz |
Update license headers
License changed to GPLv3 + Commercial
Change-Id: I267c97216e717ed29071df064337e1bcf83de973
Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
Diffstat (limited to 'meta-vib4-extras')
-rw-r--r-- | meta-vib4-extras/conf/layer.conf | 22 | ||||
-rw-r--r-- | meta-vib4-extras/recipes/linux/linux-nvidia.bbappend | 22 | ||||
-rw-r--r-- | meta-vib4-extras/recipes/systemd/systemd_%.bbappend | 22 | ||||
-rw-r--r-- | meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend | 22 |
4 files changed, 60 insertions, 28 deletions
diff --git a/meta-vib4-extras/conf/layer.conf b/meta-vib4-extras/conf/layer.conf index 89fb47e..525c018 100644 --- a/meta-vib4-extras/conf/layer.conf +++ b/meta-vib4-extras/conf/layer.conf | |||
@@ -1,23 +1,31 @@ | |||
1 | ############################################################################## | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2016 The Qt Company Ltd. | 3 | ## Copyright (C) 2016 The Qt Company Ltd. |
4 | ## Contact: http://www.qt.io/licensing/ | 4 | ## Contact: https://www.qt.io/licensing/ |
5 | ## | 5 | ## |
6 | ## This file is part of the Boot to Qt meta layer. | 6 | ## This file is part of the Boot to Qt meta layer. |
7 | ## | 7 | ## |
8 | ## $QT_BEGIN_LICENSE:COMM$ | 8 | ## $QT_BEGIN_LICENSE:GPL$ |
9 | ## | ||
10 | ## Commercial License Usage | 9 | ## Commercial License Usage |
11 | ## Licensees holding valid commercial Qt licenses may use this file in | 10 | ## Licensees holding valid commercial Qt licenses may use this file in |
12 | ## accordance with the commercial license agreement provided with the | 11 | ## accordance with the commercial license agreement provided with the |
13 | ## Software or, alternatively, in accordance with the terms contained in | 12 | ## Software or, alternatively, in accordance with the terms contained in |
14 | ## a written agreement between you and The Qt Company. For licensing terms | 13 | ## a written agreement between you and The Qt Company. For licensing terms |
15 | ## and conditions see http://www.qt.io/terms-conditions. For further | 14 | ## and conditions see https://www.qt.io/terms-conditions. For further |
16 | ## information use the contact form at http://www.qt.io/contact-us. | 15 | ## information use the contact form at https://www.qt.io/contact-us. |
16 | ## | ||
17 | ## GNU General Public License Usage | ||
18 | ## Alternatively, this file may be used under the terms of the GNU | ||
19 | ## General Public License version 3 or (at your option) any later version | ||
20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ## included in the packaging of this file. Please review the following | ||
23 | ## information to ensure the GNU General Public License requirements will | ||
24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
17 | ## | 25 | ## |
18 | ## $QT_END_LICENSE$ | 26 | ## $QT_END_LICENSE$ |
19 | ## | 27 | ## |
20 | ############################################################################## | 28 | ############################################################################ |
21 | 29 | ||
22 | # We have a conf and classes directory, append to BBPATH | 30 | # We have a conf and classes directory, append to BBPATH |
23 | BBPATH .= ":${LAYERDIR}" | 31 | BBPATH .= ":${LAYERDIR}" |
diff --git a/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend b/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend index 8861fc3..07c9646 100644 --- a/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend +++ b/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend | |||
@@ -1,24 +1,32 @@ | |||
1 | 1 | ||
2 | ############################################################################## | 2 | ############################################################################ |
3 | ## | 3 | ## |
4 | ## Copyright (C) 2016 The Qt Company Ltd. | 4 | ## Copyright (C) 2016 The Qt Company Ltd. |
5 | ## Contact: http://www.qt.io/licensing/ | 5 | ## Contact: https://www.qt.io/licensing/ |
6 | ## | 6 | ## |
7 | ## This file is part of the Boot to Qt meta layer. | 7 | ## This file is part of the Boot to Qt meta layer. |
8 | ## | 8 | ## |
9 | ## $QT_BEGIN_LICENSE:COMM$ | 9 | ## $QT_BEGIN_LICENSE:GPL$ |
10 | ## | ||
11 | ## Commercial License Usage | 10 | ## Commercial License Usage |
12 | ## Licensees holding valid commercial Qt licenses may use this file in | 11 | ## Licensees holding valid commercial Qt licenses may use this file in |
13 | ## accordance with the commercial license agreement provided with the | 12 | ## accordance with the commercial license agreement provided with the |
14 | ## Software or, alternatively, in accordance with the terms contained in | 13 | ## Software or, alternatively, in accordance with the terms contained in |
15 | ## a written agreement between you and The Qt Company. For licensing terms | 14 | ## a written agreement between you and The Qt Company. For licensing terms |
16 | ## and conditions see http://www.qt.io/terms-conditions. For further | 15 | ## and conditions see https://www.qt.io/terms-conditions. For further |
17 | ## information use the contact form at http://www.qt.io/contact-us. | 16 | ## information use the contact form at https://www.qt.io/contact-us. |
17 | ## | ||
18 | ## GNU General Public License Usage | ||
19 | ## Alternatively, this file may be used under the terms of the GNU | ||
20 | ## General Public License version 3 or (at your option) any later version | ||
21 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
22 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
23 | ## included in the packaging of this file. Please review the following | ||
24 | ## information to ensure the GNU General Public License requirements will | ||
25 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
18 | ## | 26 | ## |
19 | ## $QT_END_LICENSE$ | 27 | ## $QT_END_LICENSE$ |
20 | ## | 28 | ## |
21 | ############################################################################## | 29 | ############################################################################ |
22 | 30 | ||
23 | do_kernel_defconfig_prepend () { | 31 | do_kernel_defconfig_prepend () { |
24 | } | 32 | } |
diff --git a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend index 9b56df1..dbeb030 100644 --- a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend +++ b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend | |||
@@ -1,22 +1,30 @@ | |||
1 | ############################################################################## | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2016 The Qt Company Ltd. | 3 | ## Copyright (C) 2016 The Qt Company Ltd. |
4 | ## Contact: http://www.qt.io/licensing/ | 4 | ## Contact: https://www.qt.io/licensing/ |
5 | ## | 5 | ## |
6 | ## This file is part of the Boot to Qt meta layer. | 6 | ## This file is part of the Boot to Qt meta layer. |
7 | ## | 7 | ## |
8 | ## $QT_BEGIN_LICENSE:COMM$ | 8 | ## $QT_BEGIN_LICENSE:GPL$ |
9 | ## | ||
10 | ## Commercial License Usage | 9 | ## Commercial License Usage |
11 | ## Licensees holding valid commercial Qt licenses may use this file in | 10 | ## Licensees holding valid commercial Qt licenses may use this file in |
12 | ## accordance with the commercial license agreement provided with the | 11 | ## accordance with the commercial license agreement provided with the |
13 | ## Software or, alternatively, in accordance with the terms contained in | 12 | ## Software or, alternatively, in accordance with the terms contained in |
14 | ## a written agreement between you and The Qt Company. For licensing terms | 13 | ## a written agreement between you and The Qt Company. For licensing terms |
15 | ## and conditions see http://www.qt.io/terms-conditions. For further | 14 | ## and conditions see https://www.qt.io/terms-conditions. For further |
16 | ## information use the contact form at http://www.qt.io/contact-us. | 15 | ## information use the contact form at https://www.qt.io/contact-us. |
16 | ## | ||
17 | ## GNU General Public License Usage | ||
18 | ## Alternatively, this file may be used under the terms of the GNU | ||
19 | ## General Public License version 3 or (at your option) any later version | ||
20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ## included in the packaging of this file. Please review the following | ||
23 | ## information to ensure the GNU General Public License requirements will | ||
24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
17 | ## | 25 | ## |
18 | ## $QT_END_LICENSE$ | 26 | ## $QT_END_LICENSE$ |
19 | ## | 27 | ## |
20 | ############################################################################## | 28 | ############################################################################ |
21 | 29 | ||
22 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 30 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend b/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend index 2c46f2d..f892961 100644 --- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend +++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend | |||
@@ -1,23 +1,31 @@ | |||
1 | ############################################################################## | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2016 The Qt Company Ltd. | 3 | ## Copyright (C) 2016 The Qt Company Ltd. |
4 | ## Contact: http://www.qt.io/licensing/ | 4 | ## Contact: https://www.qt.io/licensing/ |
5 | ## | 5 | ## |
6 | ## This file is part of the Boot to Qt meta layer. | 6 | ## This file is part of the Boot to Qt meta layer. |
7 | ## | 7 | ## |
8 | ## $QT_BEGIN_LICENSE:COMM$ | 8 | ## $QT_BEGIN_LICENSE:GPL$ |
9 | ## | ||
10 | ## Commercial License Usage | 9 | ## Commercial License Usage |
11 | ## Licensees holding valid commercial Qt licenses may use this file in | 10 | ## Licensees holding valid commercial Qt licenses may use this file in |
12 | ## accordance with the commercial license agreement provided with the | 11 | ## accordance with the commercial license agreement provided with the |
13 | ## Software or, alternatively, in accordance with the terms contained in | 12 | ## Software or, alternatively, in accordance with the terms contained in |
14 | ## a written agreement between you and The Qt Company. For licensing terms | 13 | ## a written agreement between you and The Qt Company. For licensing terms |
15 | ## and conditions see http://www.qt.io/terms-conditions. For further | 14 | ## and conditions see https://www.qt.io/terms-conditions. For further |
16 | ## information use the contact form at http://www.qt.io/contact-us. | 15 | ## information use the contact form at https://www.qt.io/contact-us. |
16 | ## | ||
17 | ## GNU General Public License Usage | ||
18 | ## Alternatively, this file may be used under the terms of the GNU | ||
19 | ## General Public License version 3 or (at your option) any later version | ||
20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ## included in the packaging of this file. Please review the following | ||
23 | ## information to ensure the GNU General Public License requirements will | ||
24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
17 | ## | 25 | ## |
18 | ## $QT_END_LICENSE$ | 26 | ## $QT_END_LICENSE$ |
19 | ## | 27 | ## |
20 | ############################################################################## | 28 | ############################################################################ |
21 | 29 | ||
22 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" | 30 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" |
23 | 31 | ||