diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-11-16 09:11:35 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-11-16 09:20:30 +0200 |
commit | 3ee5d97e4de4356d416dad28239324ab757ec27a (patch) | |
tree | 3ac0b2e78af68c8dab5fba40b2f0423f91041845 | |
parent | 1f764ffe81de51f9c8ee1cbac33abfb2fb3bc722 (diff) | |
parent | c4ee36ecc578f660070916c8c7697ea7dfc3dc16 (diff) | |
download | meta-boot2qt-3ee5d97e4de4356d416dad28239324ab757ec27a.tar.gz |
Merge remote-tracking branch 'origin/jethro' into dev
* origin/jethro:
update maintainer email info
Use correct license header
qt5: update submodules
otf-noto: update checksums
qt5: update submodules
Change-Id: Id586a8faa62b0eefaebfdb71b5acb2cd07c38bf2
-rw-r--r-- | conf/distro/b2qt.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/colibri-imx7.conf | 35 | ||||
-rw-r--r-- | conf/distro/include/tegra-t18x.conf | 35 | ||||
-rw-r--r-- | recipes/fonts/otf-noto.bb | 4 |
4 files changed, 45 insertions, 31 deletions
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 9a59812..de7381e 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf | |||
@@ -38,7 +38,7 @@ SDK_NAME = "${DISTRO}-${SDK_MACHINE}-${IMAGE_BASENAME}" | |||
38 | TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-${MACHINE}" | 38 | TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-${MACHINE}" |
39 | BUILDCFG_VARS += "SDKMACHINE" | 39 | BUILDCFG_VARS += "SDKMACHINE" |
40 | 40 | ||
41 | MAINTAINER = "B2Qt <B2Qt@digia.com>" | 41 | MAINTAINER = "B2Qt <b2qt@qt.io>" |
42 | 42 | ||
43 | SANITY_TESTED_DISTROS += " \ | 43 | SANITY_TESTED_DISTROS += " \ |
44 | Ubuntu 11.04 \n \ | 44 | Ubuntu 11.04 \n \ |
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf index 903ad77..7a95f80 100644 --- a/conf/distro/include/colibri-imx7.conf +++ b/conf/distro/include/colibri-imx7.conf | |||
@@ -1,24 +1,31 @@ | |||
1 | ############################################################################# | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). | 3 | ## Copyright (C) 2016 The Qt Company Ltd. |
4 | ## Contact: https://www.qt.io/licensing/ | ||
4 | ## | 5 | ## |
5 | ## This file is part of the Qt Enterprise Embedded Scripts of the Qt | 6 | ## This file is part of the Boot to Qt meta layer. |
6 | ## framework. | ||
7 | ## | 7 | ## |
8 | ## $QT_BEGIN_LICENSE$ | 8 | ## $QT_BEGIN_LICENSE:GPL$ |
9 | ## Commercial License Usage Only | 9 | ## Commercial License Usage |
10 | ## Licensees holding valid commercial Qt license agreements with Digia | 10 | ## Licensees holding valid commercial Qt licenses may use this file in |
11 | ## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, | 11 | ## accordance with the commercial license agreement provided with the |
12 | ## may use this file in accordance with the terms contained in said license | 12 | ## Software or, alternatively, in accordance with the terms contained in |
13 | ## agreement. | 13 | ## a written agreement between you and The Qt Company. For licensing terms |
14 | ## | 14 | ## and conditions see https://www.qt.io/terms-conditions. For further |
15 | ## For further information use the contact form at | 15 | ## information use the contact form at https://www.qt.io/contact-us. |
16 | ## http://www.qt.io/contact-us. | ||
17 | ## | 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. | ||
18 | ## | 25 | ## |
19 | ## $QT_END_LICENSE$ | 26 | ## $QT_END_LICENSE$ |
20 | ## | 27 | ## |
21 | ############################################################################# | 28 | ############################################################################ |
22 | 29 | ||
23 | include conf/distro/include/toradex.inc | 30 | include conf/distro/include/toradex.inc |
24 | 31 | ||
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf index 349488b..ebdb63b 100644 --- a/conf/distro/include/tegra-t18x.conf +++ b/conf/distro/include/tegra-t18x.conf | |||
@@ -1,24 +1,31 @@ | |||
1 | ############################################################################# | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2016 Digia Plc and/or its subsidiary(-ies). | 3 | ## Copyright (C) 2016 The Qt Company Ltd. |
4 | ## Contact: https://www.qt.io/licensing/ | ||
4 | ## | 5 | ## |
5 | ## This file is part of the Qt Enterprise Embedded Scripts of the Qt | 6 | ## This file is part of the Boot to Qt meta layer. |
6 | ## framework. | ||
7 | ## | 7 | ## |
8 | ## $QT_BEGIN_LICENSE$ | 8 | ## $QT_BEGIN_LICENSE:GPL$ |
9 | ## Commercial License Usage Only | 9 | ## Commercial License Usage |
10 | ## Licensees holding valid commercial Qt license agreements with Digia | 10 | ## Licensees holding valid commercial Qt licenses may use this file in |
11 | ## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, | 11 | ## accordance with the commercial license agreement provided with the |
12 | ## may use this file in accordance with the terms contained in said license | 12 | ## Software or, alternatively, in accordance with the terms contained in |
13 | ## agreement. | 13 | ## a written agreement between you and The Qt Company. For licensing terms |
14 | ## | 14 | ## and conditions see https://www.qt.io/terms-conditions. For further |
15 | ## For further information use the contact form at | 15 | ## information use the contact form at https://www.qt.io/contact-us. |
16 | ## http://www.qt.io/contact-us. | ||
17 | ## | 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. | ||
18 | ## | 25 | ## |
19 | ## $QT_END_LICENSE$ | 26 | ## $QT_END_LICENSE$ |
20 | ## | 27 | ## |
21 | ############################################################################# | 28 | ############################################################################ |
22 | 29 | ||
23 | OLDEST_KERNEL_aarch64 = "3.18" | 30 | OLDEST_KERNEL_aarch64 = "3.18" |
24 | 31 | ||
diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb index c868329..1c17d33 100644 --- a/recipes/fonts/otf-noto.bb +++ b/recipes/fonts/otf-noto.bb | |||
@@ -40,8 +40,8 @@ inherit allarch fontcache | |||
40 | PV = "1.004" | 40 | PV = "1.004" |
41 | SRC_URI = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKsc-hinted.zip" | 41 | SRC_URI = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKsc-hinted.zip" |
42 | 42 | ||
43 | SRC_URI[md5sum] = "3a2e70a4cd1f4ca4b546146b8556dffb" | 43 | SRC_URI[md5sum] = "539a04d2a14a12096897f84ba046d110" |
44 | SRC_URI[sha256sum] = "89646c86a48c1d5d25d435c31d673695bbd5751534004e9746f7d4aa71402a8f" | 44 | SRC_URI[sha256sum] = "c0a77b24ce1964c5d244be7576ada5899d681638e0abd0917e6a661df56e0232" |
45 | 45 | ||
46 | S = "${WORKDIR}" | 46 | S = "${WORKDIR}" |
47 | 47 | ||