diff options
Diffstat (limited to 'classes')
-rw-r--r-- | classes/abi-arch.bbclass | 22 | ||||
-rw-r--r-- | classes/bootfs-image.bbclass | 22 | ||||
-rw-r--r-- | classes/consistent_timestamps.bbclass | 35 | ||||
-rw-r--r-- | classes/deploy-conf.bbclass | 22 | ||||
-rw-r--r-- | classes/image-hdd.bbclass | 22 | ||||
-rw-r--r-- | classes/image_dd.bbclass | 22 | ||||
-rw-r--r-- | classes/image_types_sdcard.bbclass | 24 | ||||
-rw-r--r-- | classes/internal-build.bbclass | 23 | ||||
-rw-r--r-- | classes/populate_b2qt_qt5_sdk.bbclass | 22 | ||||
-rw-r--r-- | classes/populate_b2qt_sdk.bbclass | 22 | ||||
-rw-r--r-- | classes/qt5-module.bbclass | 22 | ||||
-rw-r--r-- | classes/qtquickcompiler.bbclass | 22 | ||||
-rw-r--r-- | classes/sdk-sources.bbclass | 40 |
13 files changed, 226 insertions, 94 deletions
diff --git a/classes/abi-arch.bbclass b/classes/abi-arch.bbclass index 826fed4..23b9b1c 100644 --- a/classes/abi-arch.bbclass +++ b/classes/abi-arch.bbclass | |||
@@ -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 | # map target architecture to abi architectures used by Qt Creator | 30 | # map target architecture to abi architectures used by Qt Creator |
23 | valid_archs = "arm x86 itanium mips ppc sh" | 31 | valid_archs = "arm x86 itanium mips ppc sh" |
diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass index 56b2acb..2104b50 100644 --- a/classes/bootfs-image.bbclass +++ b/classes/bootfs-image.bbclass | |||
@@ -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 | BOOTFS_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}-${DATETIME}" | 30 | BOOTFS_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}-${DATETIME}" |
23 | BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}" | 31 | BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}" |
diff --git a/classes/consistent_timestamps.bbclass b/classes/consistent_timestamps.bbclass new file mode 100644 index 0000000..08cc401 --- /dev/null +++ b/classes/consistent_timestamps.bbclass | |||
@@ -0,0 +1,35 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: https://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:GPL$ | ||
9 | ## Commercial License Usage | ||
10 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
11 | ## accordance with the commercial license agreement provided with the | ||
12 | ## Software or, alternatively, in accordance with the terms contained in | ||
13 | ## a written agreement between you and The Qt Company. For licensing terms | ||
14 | ## and conditions see https://www.qt.io/terms-conditions. For further | ||
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. | ||
25 | ## | ||
26 | ## $QT_END_LICENSE$ | ||
27 | ## | ||
28 | ############################################################################ | ||
29 | |||
30 | update_file_timestaps() { | ||
31 | # Update file timestamp to 0 seconds since Epoch time. | ||
32 | TZ=UTC find ${IMAGE_ROOTFS} -exec touch -h -m -t '197001010000' {} \; | ||
33 | } | ||
34 | |||
35 | ROOTFS_POSTINSTALL_COMMAND += "update_file_timestaps; " | ||
diff --git a/classes/deploy-conf.bbclass b/classes/deploy-conf.bbclass index 8467576..61df5dc 100644 --- a/classes/deploy-conf.bbclass +++ b/classes/deploy-conf.bbclass | |||
@@ -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 | inherit image_types | 30 | inherit image_types |
23 | 31 | ||
diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index c4940aa..05fd847 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass | |||
@@ -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 | # need to define the dependency and the ROOTFS for directdisk | 30 | # need to define the dependency and the ROOTFS for directdisk |
23 | do_bootdirectdisk[depends] += "${PN}:do_rootfs" | 31 | do_bootdirectdisk[depends] += "${PN}:do_rootfs" |
diff --git a/classes/image_dd.bbclass b/classes/image_dd.bbclass index 4d193b7..07cd58f 100644 --- a/classes/image_dd.bbclass +++ b/classes/image_dd.bbclass | |||
@@ -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 | # This class is based on meta-fsl-arm/classes/image_types_fsl.bbclass::generate_imx_sdcard() | 30 | # This class is based on meta-fsl-arm/classes/image_types_fsl.bbclass::generate_imx_sdcard() |
23 | DESCRIPTION = "The base class for building images that can be deployed with GNU coreutils dd tool." | 31 | DESCRIPTION = "The base class for building images that can be deployed with GNU coreutils dd tool." |
diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass index 0ce12e4..e9b07f1 100644 --- a/classes/image_types_sdcard.bbclass +++ b/classes/image_types_sdcard.bbclass | |||
@@ -1,27 +1,35 @@ | |||
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 | IMAGE_ROOTFS_EXTRA_SPACE = "100000" | 30 | IMAGE_ROOTFS_EXTRA_SPACE = "100000" |
23 | SDCARD_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" | 31 | SDCARD_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" |
24 | SDCARD_GENERATION_COMMAND_ti33x = "generate_imx_sdcard" | 32 | SDCARD_GENERATION_COMMAND ?= "generate_imx_sdcard" |
25 | 33 | ||
26 | IMAGE_CMD_sdcard_append() { | 34 | IMAGE_CMD_sdcard_append() { |
27 | parted -s ${SDCARD} set 1 boot on | 35 | parted -s ${SDCARD} set 1 boot on |
diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass index 72498cb..ecee863 100644 --- a/classes/internal-build.bbclass +++ b/classes/internal-build.bbclass | |||
@@ -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 | python enable_internal_build () { | 30 | python enable_internal_build () { |
23 | import socket | 31 | import socket |
@@ -39,7 +47,6 @@ python enable_internal_build () { | |||
39 | hg://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 47 | hg://.*/.* http://yocto-cache.ci.local/sources/ \n \ |
40 | osc://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 48 | osc://.*/.* http://yocto-cache.ci.local/sources/ \n \ |
41 | p4://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 49 | p4://.*/.* http://yocto-cache.ci.local/sources/ \n \ |
42 | svk://.*/.* http://yocto-cache.ci.local/sources/ \n \ | ||
43 | svn://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 50 | svn://.*/.* http://yocto-cache.ci.local/sources/ \n \ |
44 | ") | 51 | ") |
45 | } | 52 | } |
diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/classes/populate_b2qt_qt5_sdk.bbclass index ae88685..7acd095 100644 --- a/classes/populate_b2qt_qt5_sdk.bbclass +++ b/classes/populate_b2qt_qt5_sdk.bbclass | |||
@@ -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 | inherit populate_b2qt_sdk populate_sdk_qt5_base abi-arch siteinfo | 30 | inherit populate_b2qt_sdk populate_sdk_qt5_base abi-arch siteinfo |
23 | 31 | ||
diff --git a/classes/populate_b2qt_sdk.bbclass b/classes/populate_b2qt_sdk.bbclass index cce6669..75c6e55 100644 --- a/classes/populate_b2qt_sdk.bbclass +++ b/classes/populate_b2qt_sdk.bbclass | |||
@@ -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 | inherit populate_sdk | 30 | inherit populate_sdk |
23 | 31 | ||
diff --git a/classes/qt5-module.bbclass b/classes/qt5-module.bbclass index febd6b0..e68f95f 100644 --- a/classes/qt5-module.bbclass +++ b/classes/qt5-module.bbclass | |||
@@ -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 | require recipes-qt/qt5/qt5.inc | 30 | require recipes-qt/qt5/qt5.inc |
diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass index 90fcfb4..3564ad1 100644 --- a/classes/qtquickcompiler.bbclass +++ b/classes/qtquickcompiler.bbclass | |||
@@ -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 | python __anonymous() { | 30 | python __anonymous() { |
23 | provider = "" | 31 | provider = "" |
diff --git a/classes/sdk-sources.bbclass b/classes/sdk-sources.bbclass index 5f75357..b12f371 100644 --- a/classes/sdk-sources.bbclass +++ b/classes/sdk-sources.bbclass | |||
@@ -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 | python do_fetch () { | 30 | python do_fetch () { |
23 | src_uri = (d.getVar('SRC_URI', True) or "").split() | 31 | src_uri = (d.getVar('SRC_URI', True) or "").split() |
@@ -44,6 +52,7 @@ python do_fetch () { | |||
44 | } | 52 | } |
45 | 53 | ||
46 | python do_unpack () { | 54 | python do_unpack () { |
55 | sdk_uds = []; | ||
47 | src_uri = (d.getVar('SRC_URI', True) or "").split() | 56 | src_uri = (d.getVar('SRC_URI', True) or "").split() |
48 | if len(src_uri) == 0: | 57 | if len(src_uri) == 0: |
49 | return | 58 | return |
@@ -56,17 +65,18 @@ python do_unpack () { | |||
56 | for url in uris: | 65 | for url in uris: |
57 | ud = list(bb.fetch2.decodeurl(url)) | 66 | ud = list(bb.fetch2.decodeurl(url)) |
58 | if ("sdk-uri" in ud[5]): | 67 | if ("sdk-uri" in ud[5]): |
59 | unpack_local_uri(ud, d) | 68 | sdk_uds.append(ud) |
60 | src_uri.remove(url) | 69 | src_uri.remove(url) |
61 | 70 | ||
62 | if len(src_uri) == 0: | 71 | if len(src_uri) != 0: |
63 | return | 72 | try: |
73 | fetcher = bb.fetch2.Fetch(src_uri, d) | ||
74 | fetcher.unpack(rootdir) | ||
75 | except bb.fetch2.BBFetchException as e: | ||
76 | raise bb.build.FuncFailed(e) | ||
64 | 77 | ||
65 | try: | 78 | for ud in sdk_uds: |
66 | fetcher = bb.fetch2.Fetch(src_uri, d) | 79 | unpack_local_uri(ud, d) |
67 | fetcher.unpack(rootdir) | ||
68 | except bb.fetch2.BBFetchException as e: | ||
69 | raise bb.build.FuncFailed(e) | ||
70 | } | 80 | } |
71 | 81 | ||
72 | def unpack_local_uri(ud, d): | 82 | def unpack_local_uri(ud, d): |