diff options
Diffstat (limited to 'conf')
38 files changed, 110 insertions, 731 deletions
diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample deleted file mode 100644 index ddd469b..0000000 --- a/conf/bblayers.conf.bbb.sample +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
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 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | ||
31 | # changes incompatibly | ||
32 | LCONF_VERSION = "6" | ||
33 | |||
34 | BBPATH = "${TOPDIR}" | ||
35 | BBFILES ?= "" | ||
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | ||
37 | |||
38 | BBLAYERS ?= " \ | ||
39 | ${BSPDIR}/sources/poky/meta \ | ||
40 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
41 | ${BSPDIR}/sources/meta-beagleboard/common-bsp \ | ||
42 | ${BSPDIR}/sources/meta-ti \ | ||
43 | ${BSPDIR}/sources/meta-fsl-arm \ | ||
44 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | ||
45 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | ||
46 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | ||
47 | ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ | ||
48 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ | ||
49 | ${BSPDIR}/sources/meta-boot2qt \ | ||
50 | ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \ | ||
51 | ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \ | ||
52 | ${BSPDIR}/sources/meta-mingw \ | ||
53 | ${BSPDIR}/sources/meta-qt5 \ | ||
54 | " | ||
55 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
56 | ${BSPDIR}/sources/poky/meta \ | ||
57 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
58 | " | ||
diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample index 75d7aae..381c488 100644 --- a/conf/bblayers.conf.emulator.sample +++ b/conf/bblayers.conf.emulator.sample | |||
@@ -27,9 +27,9 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
31 | # changes incompatibly | 31 | # changes incompatibly |
32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
41 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 41 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
42 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | 42 | ${BSPDIR}/sources/meta-openembedded/meta-python \ |
43 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | 43 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ |
@@ -47,7 +47,3 @@ BBLAYERS ?= " \ | |||
47 | ${BSPDIR}/sources/meta-mingw \ | 47 | ${BSPDIR}/sources/meta-mingw \ |
48 | ${BSPDIR}/sources/meta-qt5 \ | 48 | ${BSPDIR}/sources/meta-qt5 \ |
49 | " | 49 | " |
50 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
51 | ${BSPDIR}/sources/poky/meta \ | ||
52 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
53 | " | ||
diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample index 1a255de..61e12fa 100644 --- a/conf/bblayers.conf.fsl.sample +++ b/conf/bblayers.conf.fsl.sample | |||
@@ -27,9 +27,9 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
31 | # changes incompatibly | 31 | # changes incompatibly |
32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
41 | ${BSPDIR}/sources/meta-fsl-arm \ | 41 | ${BSPDIR}/sources/meta-fsl-arm \ |
42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | 42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ |
43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
@@ -50,7 +50,3 @@ BBLAYERS ?= " \ | |||
50 | ${BSPDIR}/sources/meta-mingw \ | 50 | ${BSPDIR}/sources/meta-mingw \ |
51 | ${BSPDIR}/sources/meta-qt5 \ | 51 | ${BSPDIR}/sources/meta-qt5 \ |
52 | " | 52 | " |
53 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
54 | ${BSPDIR}/sources/poky/meta \ | ||
55 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
56 | " | ||
diff --git a/conf/bblayers.conf.intel.sample b/conf/bblayers.conf.intel.sample index c03ad50..e6094d6 100644 --- a/conf/bblayers.conf.intel.sample +++ b/conf/bblayers.conf.intel.sample | |||
@@ -27,9 +27,9 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
31 | # changes incompatibly | 31 | # changes incompatibly |
32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
41 | ${BSPDIR}/sources/meta-intel \ | 41 | ${BSPDIR}/sources/meta-intel \ |
42 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 42 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
43 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | 43 | ${BSPDIR}/sources/meta-openembedded/meta-python \ |
@@ -49,7 +49,3 @@ BBLAYERS ?= " \ | |||
49 | ${BSPDIR}/sources/meta-mingw \ | 49 | ${BSPDIR}/sources/meta-mingw \ |
50 | ${BSPDIR}/sources/meta-qt5 \ | 50 | ${BSPDIR}/sources/meta-qt5 \ |
51 | " | 51 | " |
52 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
53 | ${BSPDIR}/sources/poky/meta \ | ||
54 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
55 | " | ||
diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample deleted file mode 100644 index f893f8c..0000000 --- a/conf/bblayers.conf.nvidia-logan.sample +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
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 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | ||
31 | # changes incompatibly | ||
32 | LCONF_VERSION = "6" | ||
33 | |||
34 | BBPATH = "${TOPDIR}" | ||
35 | BBFILES ?= "" | ||
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | ||
37 | |||
38 | BBLAYERS ?= " \ | ||
39 | ${BSPDIR}/sources/poky/meta \ | ||
40 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
41 | ${BSPDIR}/sources/nvidia-layer/meta-tegra \ | ||
42 | ${BSPDIR}/sources/nvidia-layer/meta-vib3 \ | ||
43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | ||
44 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | ||
45 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | ||
46 | ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ | ||
47 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ | ||
48 | ${BSPDIR}/sources/meta-boot2qt \ | ||
49 | ${BSPDIR}/sources/meta-boot2qt/meta-vib3-extras \ | ||
50 | ${BSPDIR}/sources/meta-boot2qt/meta-tegra-extras \ | ||
51 | ${BSPDIR}/sources/meta-mingw \ | ||
52 | ${BSPDIR}/sources/meta-qt5 \ | ||
53 | " | ||
54 | |||
55 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
56 | ${BSPDIR}/sources/poky/meta \ | ||
57 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
58 | " | ||
diff --git a/conf/bblayers.conf.nvidia-tegra.sample b/conf/bblayers.conf.nvidia-tegra.sample index 1fbce2b..ec480ef 100644 --- a/conf/bblayers.conf.nvidia-tegra.sample +++ b/conf/bblayers.conf.nvidia-tegra.sample | |||
@@ -27,9 +27,9 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
31 | # changes incompatibly | 31 | # changes incompatibly |
32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
41 | ${BSPDIR}/sources/nvidia-layer/meta-tegra \ | 41 | ${BSPDIR}/sources/nvidia-layer/meta-tegra \ |
42 | ${BSPDIR}/sources/nvidia-layer/meta-vib4 \ | 42 | ${BSPDIR}/sources/nvidia-layer/meta-vib4 \ |
43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
@@ -51,8 +51,3 @@ BBLAYERS ?= " \ | |||
51 | ${BSPDIR}/sources/meta-mingw \ | 51 | ${BSPDIR}/sources/meta-mingw \ |
52 | ${BSPDIR}/sources/meta-qt5 \ | 52 | ${BSPDIR}/sources/meta-qt5 \ |
53 | " | 53 | " |
54 | |||
55 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
56 | ${BSPDIR}/sources/poky/meta \ | ||
57 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
58 | " | ||
diff --git a/conf/bblayers.conf.rcar-gen2.sample b/conf/bblayers.conf.rcar-gen2.sample index f19b1ea..27f28ae 100644 --- a/conf/bblayers.conf.rcar-gen2.sample +++ b/conf/bblayers.conf.rcar-gen2.sample | |||
@@ -27,9 +27,9 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
31 | # changes incompatibly | 31 | # changes incompatibly |
32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
@@ -37,12 +37,12 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/meta-boot2qt \ | 39 | ${BSPDIR}/sources/meta-boot2qt \ |
40 | ${BSPDIR}/sources/meta-renesas \ | ||
41 | ${BSPDIR}/sources/meta-renesas/meta-rcar-gen2 \ | ||
40 | ${BSPDIR}/sources/poky/meta \ | 42 | ${BSPDIR}/sources/poky/meta \ |
41 | ${BSPDIR}/sources/poky/meta-yocto \ | 43 | ${BSPDIR}/sources/poky/meta-poky \ |
42 | ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \ | 44 | ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \ |
43 | ${BSPDIR}/sources/meta-fsl-arm \ | 45 | ${BSPDIR}/sources/meta-fsl-arm \ |
44 | ${BSPDIR}/sources/meta-renesas \ | ||
45 | ${BSPDIR}/sources/meta-renesas/meta-rcar-gen2 \ | ||
46 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 46 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
47 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | 47 | ${BSPDIR}/sources/meta-openembedded/meta-python \ |
48 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | 48 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ |
@@ -51,7 +51,3 @@ BBLAYERS ?= " \ | |||
51 | ${BSPDIR}/sources/meta-qt5 \ | 51 | ${BSPDIR}/sources/meta-qt5 \ |
52 | ${BSPDIR}/sources/meta-mingw \ | 52 | ${BSPDIR}/sources/meta-mingw \ |
53 | " | 53 | " |
54 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
55 | ${BSPDIR}/sources/poky/meta \ | ||
56 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
57 | " | ||
diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample index c788ab0..e376bea 100644 --- a/conf/bblayers.conf.rpi.sample +++ b/conf/bblayers.conf.rpi.sample | |||
@@ -27,9 +27,9 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
31 | # changes incompatibly | 31 | # changes incompatibly |
32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
41 | ${BSPDIR}/sources/meta-raspberrypi \ | 41 | ${BSPDIR}/sources/meta-raspberrypi \ |
42 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 42 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
43 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | 43 | ${BSPDIR}/sources/meta-openembedded/meta-python \ |
@@ -49,7 +49,3 @@ BBLAYERS ?= " \ | |||
49 | ${BSPDIR}/sources/meta-mingw \ | 49 | ${BSPDIR}/sources/meta-mingw \ |
50 | ${BSPDIR}/sources/meta-qt5 \ | 50 | ${BSPDIR}/sources/meta-qt5 \ |
51 | " | 51 | " |
52 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
53 | ${BSPDIR}/sources/poky/meta \ | ||
54 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
55 | " | ||
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index 8b3e578..381c488 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample | |||
@@ -27,9 +27,9 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
31 | # changes incompatibly | 31 | # changes incompatibly |
32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
@@ -37,24 +37,13 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
41 | ${BSPDIR}/sources/meta-fsl-arm \ | ||
42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | ||
43 | ${BSPDIR}/sources/meta-beagleboard/common-bsp \ | ||
44 | ${BSPDIR}/sources/meta-ti \ | ||
45 | ${BSPDIR}/sources/meta-raspberrypi \ | ||
46 | ${BSPDIR}/sources/meta-toradex \ | ||
47 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 41 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
42 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | ||
43 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | ||
44 | ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ | ||
48 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ | 45 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ |
49 | ${BSPDIR}/sources/meta-boot2qt \ | 46 | ${BSPDIR}/sources/meta-boot2qt \ |
50 | ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \ | ||
51 | ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \ | ||
52 | ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \ | ||
53 | ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \ | ||
54 | ${BSPDIR}/sources/meta-mingw \ | 47 | ${BSPDIR}/sources/meta-mingw \ |
55 | ${BSPDIR}/sources/meta-qt5 \ | 48 | ${BSPDIR}/sources/meta-qt5 \ |
56 | " | 49 | " |
57 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
58 | ${BSPDIR}/sources/poky/meta \ | ||
59 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
60 | " | ||
diff --git a/conf/bblayers.conf.smx6.sample b/conf/bblayers.conf.smx6.sample index 55a9535..b10e415 100644 --- a/conf/bblayers.conf.smx6.sample +++ b/conf/bblayers.conf.smx6.sample | |||
@@ -27,9 +27,9 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
31 | # changes incompatibly | 31 | # changes incompatibly |
32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
41 | ${BSPDIR}/sources/meta-fsl-arm \ | 41 | ${BSPDIR}/sources/meta-fsl-arm \ |
42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | 42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ |
43 | ${BSPDIR}/sources/meta-smx6 \ | 43 | ${BSPDIR}/sources/meta-smx6 \ |
@@ -52,7 +52,3 @@ BBLAYERS ?= " \ | |||
52 | ${BSPDIR}/sources/meta-mingw \ | 52 | ${BSPDIR}/sources/meta-mingw \ |
53 | ${BSPDIR}/sources/meta-qt5 \ | 53 | ${BSPDIR}/sources/meta-qt5 \ |
54 | " | 54 | " |
55 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
56 | ${BSPDIR}/sources/poky/meta \ | ||
57 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
58 | " | ||
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample index 527b404..8ad8960 100644 --- a/conf/bblayers.conf.ti.sample +++ b/conf/bblayers.conf.ti.sample | |||
@@ -27,9 +27,9 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
31 | # changes incompatibly | 31 | # changes incompatibly |
32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
41 | ${BSPDIR}/sources/meta-ti \ | 41 | ${BSPDIR}/sources/meta-ti \ |
42 | ${BSPDIR}/sources/meta-fsl-arm \ | 42 | ${BSPDIR}/sources/meta-fsl-arm \ |
43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
@@ -50,7 +50,3 @@ BBLAYERS ?= " \ | |||
50 | ${BSPDIR}/sources/meta-mingw \ | 50 | ${BSPDIR}/sources/meta-mingw \ |
51 | ${BSPDIR}/sources/meta-qt5 \ | 51 | ${BSPDIR}/sources/meta-qt5 \ |
52 | " | 52 | " |
53 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
54 | ${BSPDIR}/sources/poky/meta \ | ||
55 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
56 | " | ||
diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample deleted file mode 100644 index 6351d1f..0000000 --- a/conf/bblayers.conf.tibidabo.sample +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
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 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | ||
31 | # changes incompatibly | ||
32 | LCONF_VERSION = "6" | ||
33 | |||
34 | BBPATH = "${TOPDIR}" | ||
35 | BBFILES ?= "" | ||
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | ||
37 | |||
38 | BBLAYERS ?= " \ | ||
39 | ${BSPDIR}/sources/poky/meta \ | ||
40 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
41 | ${BSPDIR}/sources/meta-fsl-arm \ | ||
42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | ||
43 | ${BSPDIR}/sources/meta-tibidabo \ | ||
44 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | ||
45 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | ||
46 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | ||
47 | ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ | ||
48 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ | ||
49 | ${BSPDIR}/sources/meta-boot2qt \ | ||
50 | ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \ | ||
51 | ${BSPDIR}/sources/meta-boot2qt/meta-architech-extras \ | ||
52 | ${BSPDIR}/sources/meta-mingw \ | ||
53 | ${BSPDIR}/sources/meta-qt5 \ | ||
54 | " | ||
55 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
56 | ${BSPDIR}/sources/poky/meta \ | ||
57 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
58 | " | ||
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample deleted file mode 100644 index 7e49d04..0000000 --- a/conf/bblayers.conf.toradex.sample +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
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 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | ||
31 | # changes incompatibly | ||
32 | LCONF_VERSION = "6" | ||
33 | |||
34 | BBPATH = "${TOPDIR}" | ||
35 | BBFILES ?= "" | ||
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | ||
37 | |||
38 | BBLAYERS ?= " \ | ||
39 | ${BSPDIR}/sources/poky/meta \ | ||
40 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
41 | ${BSPDIR}/sources/meta-toradex \ | ||
42 | ${BSPDIR}/sources/meta-fsl-arm \ | ||
43 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | ||
44 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | ||
45 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | ||
46 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | ||
47 | ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ | ||
48 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ | ||
49 | ${BSPDIR}/sources/meta-boot2qt \ | ||
50 | ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \ | ||
51 | ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \ | ||
52 | ${BSPDIR}/sources/meta-mingw \ | ||
53 | ${BSPDIR}/sources/meta-qt5 \ | ||
54 | " | ||
55 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
56 | ${BSPDIR}/sources/poky/meta \ | ||
57 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
58 | " | ||
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 4ba9d87..4a8f73b 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf | |||
@@ -56,9 +56,6 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit" | |||
56 | 56 | ||
57 | FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache" | 57 | FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache" |
58 | 58 | ||
59 | # backport from oe/krogoth, needed by meta-qt5 | ||
60 | PACKAGECONFIG_CONFARGS += "${EXTRA_OECONF}" | ||
61 | |||
62 | # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10 | 59 | # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10 |
63 | DISTRO_FEATURES += "gstreamer" | 60 | DISTRO_FEATURES += "gstreamer" |
64 | 61 | ||
@@ -71,10 +68,6 @@ PREFERRED_PROVIDER_udev-utils ?= "systemd" | |||
71 | PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo" | 68 | PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo" |
72 | PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native" | 69 | PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native" |
73 | 70 | ||
74 | MACHINE_EXTRA_INSTALL ?= "" | ||
75 | MACHINE_EXTRA_INSTALL_SDK ?= "" | ||
76 | MACHINE_EXTRA_INSTALL_SDK_HOST ?= "" | ||
77 | |||
78 | # Override mkspec for mingw build | 71 | # Override mkspec for mingw build |
79 | OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe" | 72 | OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe" |
80 | OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe" | 73 | OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe" |
@@ -84,9 +77,14 @@ QT_MODULE_BRANCH_PARAM = "nobranch=1" | |||
84 | 77 | ||
85 | PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler" | 78 | PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler" |
86 | 79 | ||
87 | IMAGE_FSTYPES = "tar.gz conf" | 80 | IMAGE_FSTYPES = "conf" |
88 | IMAGE_CLASSES += "image_types_sdcard deploy-conf" | 81 | IMAGE_CLASSES += "image_types_sdcard deploy-conf" |
89 | 82 | ||
83 | QBSP_IMAGE_CONTENT ?= "\ | ||
84 | ${IMAGE_LINK_NAME}.img \ | ||
85 | ${IMAGE_LINK_NAME}.conf \ | ||
86 | " | ||
87 | |||
90 | LICENSE_CREATE_PACKAGE = "1" | 88 | LICENSE_CREATE_PACKAGE = "1" |
91 | COPY_LIC_MANIFEST = "1" | 89 | COPY_LIC_MANIFEST = "1" |
92 | 90 | ||
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index 4f90a0e..4ec3e4d 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf | |||
@@ -31,28 +31,4 @@ include conf/distro/include/ti.inc | |||
31 | 31 | ||
32 | DEPLOY_CONF_NAME = "Sitara AM335x Starter Kit" | 32 | DEPLOY_CONF_NAME = "Sitara AM335x Starter Kit" |
33 | 33 | ||
34 | BOOTFS_CONTENT = "\ | ||
35 | u-boot-${MACHINE}.img:u-boot.img \ | ||
36 | MLO-${MACHINE}:MLO \ | ||
37 | " | ||
38 | BOOTFS_DEPENDS = "u-boot:do_deploy" | ||
39 | |||
40 | DISTRO_FEATURES_remove = "webengine" | 34 | DISTRO_FEATURES_remove = "webengine" |
41 | |||
42 | PREFERRED_VERSION_linux-ti-staging = "3.14%" | ||
43 | |||
44 | PREFERRED_PROVIDER_virtual/egl = "libgles-omap3" | ||
45 | PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" | ||
46 | |||
47 | PREFERRED_VERSION_libgles-omap3 = "5.01.01.02" | ||
48 | PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02" | ||
49 | |||
50 | MACHINE_EXTRA_INSTALL += "\ | ||
51 | libgles-omap3 \ | ||
52 | libgles-omap3-rawdemos \ | ||
53 | lighttpd \ | ||
54 | " | ||
55 | |||
56 | MACHINE_EXTRA_INSTALL_SDK += "\ | ||
57 | libgles-omap3-dev \ | ||
58 | " | ||
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index 1e8e876..ff939bb 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf | |||
@@ -28,8 +28,6 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | include conf/distro/include/toradex.inc | 30 | include conf/distro/include/toradex.inc |
31 | include conf/distro/include/imx6.inc | ||
32 | include conf/distro/include/imx6-egl.inc | ||
33 | 31 | ||
34 | DEPLOY_CONF_NAME = "Toradex Apalis iMX6" | 32 | DEPLOY_CONF_NAME = "Toradex Apalis iMX6" |
35 | 33 | ||
@@ -40,14 +38,6 @@ UBOOT_CONFIG ??= "com it" | |||
40 | UBOOT_CONFIG[com] = "apalis_imx6_defconfig" | 38 | UBOOT_CONFIG[com] = "apalis_imx6_defconfig" |
41 | UBOOT_CONFIG[it] = "apalis_imx6_it_defconfig" | 39 | UBOOT_CONFIG[it] = "apalis_imx6_it_defconfig" |
42 | 40 | ||
43 | BOOTFS_CONTENT = "\ | ||
44 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | ||
45 | ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ | ||
46 | ${KERNEL_IMAGETYPE}-imx6q-apalis-ixora.dtb:imx6q-apalis-ixora.dtb \ | ||
47 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-eval.dtb:imx6q-apalis_v1_0-eval.dtb \ | ||
48 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-ixora.dtb:imx6q-apalis_v1_0-ixora.dtb \ | ||
49 | " | ||
50 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | ||
51 | BOOT_SCRIPTS += " \ | 41 | BOOT_SCRIPTS += " \ |
52 | u-boot-${MACHINE}.imx-it:${MACHINEDIR}/u-boot.imx-it \ | 42 | u-boot-${MACHINE}.imx-it:${MACHINEDIR}/u-boot.imx-it \ |
53 | " | 43 | " |
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index 7f42acf..fa446d2 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf | |||
@@ -31,25 +31,6 @@ include conf/distro/include/ti.inc | |||
31 | 31 | ||
32 | DEPLOY_CONF_NAME = "BeagleBoard" | 32 | DEPLOY_CONF_NAME = "BeagleBoard" |
33 | 33 | ||
34 | BOOTFS_CONTENT = "\ | 34 | DISTRO_FEATURES_remove = "webengine opengl" |
35 | u-boot-${MACHINE}.img:u-boot.img \ | ||
36 | MLO-${MACHINE}:MLO \ | ||
37 | " | ||
38 | BOOTFS_DEPENDS = "u-boot:do_deploy" | ||
39 | |||
40 | PREFERRED_PROVIDER_virtual/egl = "libgles-omap3" | ||
41 | PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" | ||
42 | |||
43 | PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" | ||
44 | PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" | ||
45 | |||
46 | MACHINE_EXTRA_INSTALL += "\ | ||
47 | libgles-omap3 \ | ||
48 | libgles-omap3-rawdemos \ | ||
49 | " | ||
50 | |||
51 | MACHINE_EXTRA_INSTALL_SDK += "\ | ||
52 | libgles-omap3-dev \ | ||
53 | " | ||
54 | 35 | ||
55 | ADB_PRODUCTID = "0x9018" | 36 | ADB_PRODUCTID = "0x9018" |
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf index 54455a3..6f12d90 100644 --- a/conf/distro/include/beaglebone.conf +++ b/conf/distro/include/beaglebone.conf | |||
@@ -31,37 +31,6 @@ include conf/distro/include/ti.inc | |||
31 | 31 | ||
32 | DEPLOY_CONF_NAME = "BeagleBone Black" | 32 | DEPLOY_CONF_NAME = "BeagleBone Black" |
33 | 33 | ||
34 | BOOTFS_CONTENT = "\ | ||
35 | u-boot-${MACHINE}.img:u-boot.img \ | ||
36 | MLO-${MACHINE}:MLO \ | ||
37 | uEnv-${MACHINE}.txt:uEnv.txt \ | ||
38 | " | ||
39 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-uenv-script:do_deploy" | ||
40 | |||
41 | EXTRA_IMAGEDEPENDS += "u-boot-uenv-script" | ||
42 | |||
43 | DISTRO_FEATURES_remove = "webengine" | 34 | DISTRO_FEATURES_remove = "webengine" |
44 | 35 | ||
45 | PREFERRED_VERSION_libgles-omap3 = "4.10.00.01" | ||
46 | PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01" | ||
47 | |||
48 | PREFERRED_PROVIDER_virtual/egl = "libgles-omap3" | ||
49 | PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" | ||
50 | |||
51 | PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" | ||
52 | EXTRA_IMAGEDEPENDS_remove = "u-boot-denx" | ||
53 | UBOOT_MACHINE = "am335x_boneblack_config" | ||
54 | KERNEL_IMAGETYPE = "zImage" | ||
55 | |||
56 | MACHINE_EXTRA_INSTALL += "\ | ||
57 | libgles-omap3 \ | ||
58 | libgles-omap3-rawdemos \ | ||
59 | " | ||
60 | |||
61 | MACHINE_EXTRA_INSTALL_SDK += "\ | ||
62 | libgles-omap3-dev \ | ||
63 | " | ||
64 | |||
65 | ADB_PRODUCTID = "0xD002" | 36 | ADB_PRODUCTID = "0xD002" |
66 | |||
67 | DEFAULTTUNE = "armv7ahf-neon" | ||
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index 0b4b12c..987764a 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf | |||
@@ -28,16 +28,7 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | include conf/distro/include/toradex.inc | 30 | include conf/distro/include/toradex.inc |
31 | include conf/distro/include/imx6.inc | ||
32 | include conf/distro/include/imx6-egl.inc | ||
33 | 31 | ||
34 | DEPLOY_CONF_NAME = "Toradex Colibri iMX6" | 32 | DEPLOY_CONF_NAME = "Toradex Colibri iMX6" |
35 | 33 | ||
36 | KERNEL_IMAGETYPE = "uImage" | 34 | KERNEL_IMAGETYPE = "uImage" |
37 | |||
38 | BOOTFS_CONTENT = "\ | ||
39 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | ||
40 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \ | ||
41 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \ | ||
42 | " | ||
43 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | ||
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf index ca75b0a..4a4d460 100644 --- a/conf/distro/include/colibri-imx7.conf +++ b/conf/distro/include/colibri-imx7.conf | |||
@@ -31,14 +31,6 @@ include conf/distro/include/toradex.inc | |||
31 | 31 | ||
32 | DEPLOY_CONF_NAME = "Toradex Colibri iMX7" | 32 | DEPLOY_CONF_NAME = "Toradex Colibri iMX7" |
33 | 33 | ||
34 | IMAGE_FSTYPES += "ext3 sdcard" | ||
35 | |||
36 | BOOTFS_CONTENT = "\ | ||
37 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | ||
38 | ${KERNEL_IMAGETYPE}-imx7d-colibri-eval-v3.dtb:imx7d-colibri-eval-v3.dtb \ | ||
39 | ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \ | ||
40 | " | ||
41 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | ||
42 | BOOT_SCRIPTS += " \ | 34 | BOOT_SCRIPTS += " \ |
43 | u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ | 35 | u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ |
44 | " | 36 | " |
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 5a8498f..df71a91 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf | |||
@@ -29,34 +29,16 @@ | |||
29 | 29 | ||
30 | include conf/distro/include/toradex.inc | 30 | include conf/distro/include/toradex.inc |
31 | 31 | ||
32 | BBMASK .= "|meta-fsl-arm-extra/recipes-kernel/kernel-module-mcc-toradex|meta-fsl-arm-extra/recipes-kernel/kernel-modules/kernel-module-mcc_2.1.01.bb|meta-fsl-arm-extra/recipes-bsp/mqxboot" | ||
33 | |||
34 | DEPLOY_CONF_NAME = "Toradex Colibri VF" | 32 | DEPLOY_CONF_NAME = "Toradex Colibri VF" |
35 | 33 | ||
36 | IMAGE_FSTYPES += "ext3 sdcard" | ||
37 | IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" | 34 | IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" |
38 | 35 | ||
39 | BOOTFS_CONTENT = "\ | ||
40 | ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ | ||
41 | ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ | ||
42 | " | ||
43 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | ||
44 | BOOT_SCRIPTS += " \ | 36 | BOOT_SCRIPTS += " \ |
45 | u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ | 37 | u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ |
46 | " | 38 | " |
47 | 39 | ||
48 | DEFAULTTUNE = "armv7ahf-neon" | ||
49 | |||
50 | PREFERRED_PROVIDER_virtual/egl = "opengldummy" | 40 | PREFERRED_PROVIDER_virtual/egl = "opengldummy" |
51 | PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" | 41 | PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" |
52 | PREFERRED_VERSION_linux-toradex = "4.1" | 42 | PREFERRED_VERSION_linux-toradex = "4.1" |
53 | 43 | ||
54 | DISTRO_FEATURES_remove = "webengine" | 44 | DISTRO_FEATURES_remove = "webengine" |
55 | |||
56 | MACHINE_EXTRA_INSTALL += "\ | ||
57 | opengldummy \ | ||
58 | " | ||
59 | |||
60 | MACHINE_EXTRA_INSTALL_SDK += "\ | ||
61 | opengldummy-dev \ | ||
62 | " | ||
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index cd3a80a..a5b95b5 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf | |||
@@ -32,6 +32,8 @@ IMAGE_ROOTFS_ALIGNMENT = "1048576" | |||
32 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" | 32 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" |
33 | IMAGE_FSTYPES = "ext3" | 33 | IMAGE_FSTYPES = "ext3" |
34 | 34 | ||
35 | QBSP_IMAGE_CONTENT = "${IMAGE_LINK_NAME}.hdd" | ||
36 | |||
35 | MACHINE_EXTRA_RRECOMMENDS += "\ | 37 | MACHINE_EXTRA_RRECOMMENDS += "\ |
36 | kernel-module-snd-intel8x0 \ | 38 | kernel-module-snd-intel8x0 \ |
37 | " | 39 | " |
@@ -45,17 +47,9 @@ DISTRO_FEATURES_remove = "webengine opengl" | |||
45 | 47 | ||
46 | MACHINE_EXTRA_INSTALL += "\ | 48 | MACHINE_EXTRA_INSTALL += "\ |
47 | mount-vboxsf \ | 49 | mount-vboxsf \ |
48 | " | ||
49 | MACHINE_EXTRA_INSTALL_SDK += "\ | ||
50 | qtglesstream-dummy-client-dev \ | ||
51 | " | ||
52 | MACHINE_EXTRA_INSTALL_QT = "\ | ||
53 | qtsystems \ | 50 | qtsystems \ |
54 | qtglesstream \ | 51 | qtglesstream \ |
55 | b2qt-emulator-proxy \ | 52 | b2qt-emulator-proxy \ |
56 | b2qt-emulator-vinput \ | 53 | b2qt-emulator-vinput \ |
57 | b2qt-emulator-sdcardmountd \ | 54 | b2qt-emulator-sdcardmountd \ |
58 | " | 55 | " |
59 | MACHINE_EXTRA_INSTALL_QT_SDK = "\ | ||
60 | qtglesstream-dev \ | ||
61 | " | ||
diff --git a/conf/distro/include/imx6-egl.inc b/conf/distro/include/fsl.inc index 8c4bbcd..d0e2c7a 100644 --- a/conf/distro/include/imx6-egl.inc +++ b/conf/distro/include/fsl.inc | |||
@@ -27,15 +27,7 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | MACHINE_EXTRA_INSTALL += "\ | 30 | BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5" |
31 | libegl-mx6 \ | ||
32 | libgles2-mx6 \ | ||
33 | " | ||
34 | 31 | ||
35 | MACHINE_EXTRA_INSTALL_SDK += " \ | 32 | IMAGE_FSTYPES += "ext3 sdcard" |
36 | libegl-mx6 \ | 33 | IMAGE_CLASSES += "image_types_fsl" |
37 | libegl-mx6-dev \ | ||
38 | libgles2-mx6 \ | ||
39 | libgles2-mx6-dev \ | ||
40 | ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \ | ||
41 | " | ||
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 1463c67..9983af3 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf | |||
@@ -27,24 +27,11 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | include conf/distro/include/imx6.inc | 30 | include conf/distro/include/fsl.inc |
31 | include conf/distro/include/imx6-egl.inc | 31 | include conf/distro/include/opencv.inc |
32 | include conf/distro/include/imx6-opencv.inc | ||
33 | 32 | ||
34 | DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad" | 33 | DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad" |
35 | 34 | ||
36 | BOOTFS_CONTENT = "\ | ||
37 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | ||
38 | ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \ | ||
39 | ${KERNEL_IMAGETYPE}-imx6q-sabresd-hdcp.dtb:imx6q-sabresd-hdcp.dtb \ | ||
40 | ${KERNEL_IMAGETYPE}-imx6q-sabresd-ldo.dtb:imx6q-sabresd-ldo.dtb \ | ||
41 | ${KERNEL_IMAGETYPE}-imx6dl-sabresd.dtb:imx6dl-sabresd.dtb \ | ||
42 | ${KERNEL_IMAGETYPE}-imx6dl-sabresd-hdcp.dtb:imx6dl-sabresd-hdcp.dtb \ | ||
43 | ${KERNEL_IMAGETYPE}-imx6dl-sabresd-ldo.dtb:imx6dl-sabresd-ldo.dtb \ | ||
44 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
45 | " | ||
46 | BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" | ||
47 | |||
48 | DISTRO_FEATURES_DEFAULT += "wayland" | 35 | DISTRO_FEATURES_DEFAULT += "wayland" |
49 | 36 | ||
50 | KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" | 37 | KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" |
diff --git a/conf/distro/include/imx7dsabresd.conf b/conf/distro/include/imx7dsabresd.conf index b21e5b1..962077c 100644 --- a/conf/distro/include/imx7dsabresd.conf +++ b/conf/distro/include/imx7dsabresd.conf | |||
@@ -27,32 +27,8 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DEPLOY_CONF_NAME = "NXP SABRE SD i.MX7 Dual" | 30 | include conf/distro/include/fsl.inc |
31 | |||
32 | IMAGE_FSTYPES += "ext3 sdcard" | ||
33 | 31 | ||
34 | BOOTFS_CONTENT = "\ | 32 | DEPLOY_CONF_NAME = "NXP SABRE SD i.MX7 Dual" |
35 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | ||
36 | ${KERNEL_IMAGETYPE}-imx7d-sdb.dtb:imx7d-sdb.dtb \ | ||
37 | ${KERNEL_IMAGETYPE}-imx7d-sdb-enet.dtb:imx7d-sdb-enet.dtb \ | ||
38 | ${KERNEL_IMAGETYPE}-imx7d-sdb-epdc.dtb:imx7d-sdb-epdc.dtb \ | ||
39 | ${KERNEL_IMAGETYPE}-imx7d-sdb-gpmi-weim.dtb:imx7d-sdb-gpmi-weim.dtb \ | ||
40 | ${KERNEL_IMAGETYPE}-imx7d-sdb-hdmi-audio.dtb:imx7d-sdb-hdmi-audio.dtb \ | ||
41 | ${KERNEL_IMAGETYPE}-imx7d-sdb-m4.dtb:imx7d-sdb-m4.dtb \ | ||
42 | ${KERNEL_IMAGETYPE}-imx7d-sdb-qspi.dtb:imx7d-sdb-qspi.dtb \ | ||
43 | ${KERNEL_IMAGETYPE}-imx7d-sdb-sim.dtb:imx7d-sdb-sim.dtb \ | ||
44 | ${KERNEL_IMAGETYPE}-imx7d-sdb-touch.dtb:imx7d-sdb-touch.dtb \ | ||
45 | ${KERNEL_IMAGETYPE}-imx7d-sdb-wm8960.dtb:imx7d-sdb-wm8960.dtb \ | ||
46 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
47 | " | ||
48 | |||
49 | BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" | ||
50 | 33 | ||
51 | DISTRO_FEATURES_remove = "webengine" | 34 | DISTRO_FEATURES_remove = "webengine" |
52 | |||
53 | MACHINE_EXTRA_INSTALL += "\ | ||
54 | " | ||
55 | |||
56 | MACHINE_EXTRA_INSTALL_SDK += "\ | ||
57 | " | ||
58 | |||
diff --git a/conf/distro/include/intel-corei7-64.conf b/conf/distro/include/intel-corei7-64.conf index d350c0e..2ae90ee 100644 --- a/conf/distro/include/intel-corei7-64.conf +++ b/conf/distro/include/intel-corei7-64.conf | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | DEPLOY_CONF_NAME = "Intel NUC" | 30 | DEPLOY_CONF_NAME = "Intel NUC" |
31 | 31 | ||
32 | DISTRO_FEATURES_DEFAULT += "wayland weston" | 32 | DISTRO_FEATURES_DEFAULT += "wayland" |
33 | 33 | ||
34 | DISTRO_FEATURES_remove = "usbgadget" | 34 | DISTRO_FEATURES_remove = "usbgadget" |
35 | 35 | ||
@@ -41,12 +41,5 @@ INITRAMFS_IMAGE = "initramfs-basic" | |||
41 | SYSVINIT_ENABLED_GETTYS = "1" | 41 | SYSVINIT_ENABLED_GETTYS = "1" |
42 | 42 | ||
43 | MACHINE_EXTRA_INSTALL += "\ | 43 | MACHINE_EXTRA_INSTALL += "\ |
44 | wayland \ | ||
45 | mesa-megadriver \ | ||
46 | grub-efi-config \ | 44 | grub-efi-config \ |
47 | " | 45 | " |
48 | |||
49 | MACHINE_EXTRA_INSTALL_SDK += " \ | ||
50 | mesa-dev \ | ||
51 | " | ||
52 | |||
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index bfe29bf..a8db798 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf | |||
@@ -27,24 +27,11 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | include conf/distro/include/imx6.inc | 30 | include conf/distro/include/fsl.inc |
31 | include conf/distro/include/imx6-egl.inc | 31 | include conf/distro/include/opencv.inc |
32 | include conf/distro/include/imx6-opencv.inc | ||
33 | 32 | ||
34 | DEPLOY_CONF_NAME = "Boundary Devices i.MX6" | 33 | DEPLOY_CONF_NAME = "Boundary Devices i.MX6" |
35 | 34 | ||
36 | BOOTFS_CONTENT = "\ | ||
37 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | ||
38 | ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \ | ||
39 | ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \ | ||
40 | ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \ | ||
41 | ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:imx6dl-nit6xlite.dtb \ | ||
42 | ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \ | ||
43 | 6x_bootscript-${MACHINE}:6x_bootscript \ | ||
44 | 6x_upgrade-${MACHINE}:6x_upgrade \ | ||
45 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
46 | " | ||
47 | BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy" | ||
48 | BOOT_SPACE = "16384" | 35 | BOOT_SPACE = "16384" |
49 | BOOT_SCRIPTS += "6x_upgrade-${MACHINE}:6x_upgrade \ | 36 | BOOT_SCRIPTS += "6x_upgrade-${MACHINE}:6x_upgrade \ |
50 | u-boot-nit6xlite-*.imx:u-boot.nit6xlite \ | 37 | u-boot-nit6xlite-*.imx:u-boot.nit6xlite \ |
@@ -89,12 +76,10 @@ UBOOT_CONFIG[nitrogen6_max] = "nitrogen6_max_config" | |||
89 | UBOOT_CONFIG[nitrogen6_vm1g] = "nitrogen6_vm1g_config" | 76 | UBOOT_CONFIG[nitrogen6_vm1g] = "nitrogen6_vm1g_config" |
90 | UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config" | 77 | UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config" |
91 | 78 | ||
92 | EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" | 79 | EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-boundary" |
93 | 80 | ||
94 | KERNEL_DEVICETREE += "\ | 81 | KERNEL_DEVICETREE += "\ |
95 | imx6dl-nit6xlite.dtb \ | 82 | imx6dl-nit6xlite.dtb \ |
96 | imx6qp-nitrogen6_max.dtb \ | ||
97 | imx6q-nitrogen6_som2.dtb \ | ||
98 | " | 83 | " |
99 | 84 | ||
100 | DISTRO_FEATURES_DEFAULT += "wayland" | 85 | DISTRO_FEATURES_DEFAULT += "wayland" |
diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf deleted file mode 100644 index 632e31b..0000000 --- a/conf/distro/include/nvidia-logan.conf +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
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 | TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM" | ||
31 | |||
32 | DEFAULTTUNE = "cortexa15hf-neon" | ||
33 | |||
34 | KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}' | ||
35 | PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}' | ||
36 | NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" | ||
37 | |||
38 | MACHINE_EXTRA_INSTALL += "\ | ||
39 | libegl \ | ||
40 | libgles2 \ | ||
41 | tegra-firmware-gk20a \ | ||
42 | graphics-fw \ | ||
43 | libdrm-nv \ | ||
44 | " | ||
45 | |||
46 | MACHINE_EXTRA_INSTALL_SDK += "\ | ||
47 | libegl-dev \ | ||
48 | libgles2-dev \ | ||
49 | graphics-headers-dev \ | ||
50 | libdrm-nv-dev \ | ||
51 | " | ||
52 | |||
53 | PREFERRED_PROVIDER_libdrm ?= "libdrm-nv" | ||
54 | PREFERRED_PROVIDER_drm ?= "libdrm-nv" | ||
55 | |||
56 | BBMASK ?= " " | ||
57 | BBMASK .= "\ | ||
58 | |meta-vib3/recipes-kernel/linux-libc-headers\ | ||
59 | |meta-vib3/recipes-devtools/binutils\ | ||
60 | |meta-vib3/recipes-core/eglibc\ | ||
61 | |meta-vib3/recipes-core/systemd\ | ||
62 | |meta-vib3/recipes-connectivity\ | ||
63 | |meta-vib3/recipes-multimedia/pulseaudio\ | ||
64 | |meta-vib3/recipes-core/meta/external-tegra-toolchain.bb\ | ||
65 | |meta-vib3/recipes-core/packagegroups\ | ||
66 | " | ||
diff --git a/conf/distro/include/imx6-opencv.inc b/conf/distro/include/opencv.inc index a1d37df..a1d37df 100644 --- a/conf/distro/include/imx6-opencv.inc +++ b/conf/distro/include/opencv.inc | |||
diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc index 0833404..9d8b526 100644 --- a/conf/distro/include/raspberrypi.inc +++ b/conf/distro/include/raspberrypi.inc | |||
@@ -29,19 +29,7 @@ | |||
29 | 29 | ||
30 | IMAGE_FSTYPES += "ext3 rpi-sdimg" | 30 | IMAGE_FSTYPES += "ext3 rpi-sdimg" |
31 | 31 | ||
32 | BOOTFS_CONTENT = "\ | ||
33 | bcm2835-bootfiles/*: \ | ||
34 | ${KERNEL_IMAGETYPE}:kernel.img \ | ||
35 | " | ||
36 | |||
37 | BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy" | ||
38 | |||
39 | MACHINE_EXTRA_INSTALL_SDK += " \ | ||
40 | userland-dev \ | ||
41 | " | ||
42 | |||
43 | MACHINE_EXTRA_INSTALL += "\ | 32 | MACHINE_EXTRA_INSTALL += "\ |
44 | userland \ | ||
45 | omxplayer \ | 33 | omxplayer \ |
46 | " | 34 | " |
47 | 35 | ||
@@ -52,7 +40,4 @@ module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1" | |||
52 | # video camera support | 40 | # video camera support |
53 | VIDEO_CAMERA = "1" | 41 | VIDEO_CAMERA = "1" |
54 | 42 | ||
55 | RPI_FT5604 = "1" | ||
56 | KERNEL_DEVICETREE += "overlays/rpi-ft5406-overlay.dtb" | ||
57 | MACHINE_FEATURES += "pitft" | 43 | MACHINE_FEATURES += "pitft" |
58 | |||
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/raspberrypi0.conf index e686e85..647e597 100644 --- a/conf/distro/include/imx6.inc +++ b/conf/distro/include/raspberrypi0.conf | |||
@@ -27,18 +27,11 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | BBMASK ?= " " | 30 | include conf/distro/include/raspberrypi.inc |
31 | BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5" | ||
32 | 31 | ||
33 | IMAGE_FSTYPES += "ext3 sdcard" | 32 | DEPLOY_CONF_NAME = "Raspberry Pi Zero" |
34 | 33 | ||
35 | MACHINE_EXTRA_INSTALL += "\ | 34 | DISTRO_FEATURES_remove = "webengine" |
36 | libgal-mx6 \ | ||
37 | ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \ | ||
38 | ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \ | ||
39 | " | ||
40 | |||
41 | MACHINE_EXTRA_INSTALL_SDK += " \ | ||
42 | libgal-mx6 \ | ||
43 | " | ||
44 | 35 | ||
36 | # additional memory for GPU | ||
37 | GPU_MEM = "128" | ||
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc index 9b638c3..9a33319 100644 --- a/conf/distro/include/rcar-gen2.inc +++ b/conf/distro/include/rcar-gen2.inc | |||
@@ -123,18 +123,18 @@ MACHINE_EXTRA_INSTALL_append_lcb = " \ | |||
123 | " | 123 | " |
124 | 124 | ||
125 | BB_MULTIMEDIA_TEST_MODULE = "\ | 125 | BB_MULTIMEDIA_TEST_MODULE = "\ |
126 | |fdpm-tp-user-module\ | 126 | fdpm-tp-user-module \ |
127 | |mmngr-tp-user-module\ | 127 | mmngr-tp-user-module \ |
128 | |mmngrbuf-tp-user-module\ | 128 | mmngrbuf-tp-user-module \ |
129 | |s3ctl-tp-user-module\ | 129 | s3ctl-tp-user-module \ |
130 | |vspm-tp-user-module\ | 130 | vspm-tp-user-module \ |
131 | " | 131 | " |
132 | 132 | ||
133 | BBMASK ?= " " | 133 | BBMASK += "\ |
134 | BBMASK .= "\ | 134 | ${BB_MULTIMEDIA_TEST_MODULE} \ |
135 | ${BB_MULTIMEDIA_TEST_MODULE}\ | 135 | dtv-module ssp-module scu-module \ |
136 | |dtv-module|ssp-module|scu-module\ | 136 | gles-test-module \ |
137 | |gles-test-module\ | 137 | poky/meta/recipes-graphics/mesa \ |
138 | |poky/meta/recipes-graphics/mesa\ | 138 | meta-fsl-arm/recipes-graphics/mesa \ |
139 | |meta-fsl-arm/recipes-graphics/mesa\ | 139 | meta-rcar-gen2/recipes-devtools/file \ |
140 | " | 140 | " |
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf index 7c441ff..39dd17d 100644 --- a/conf/distro/include/smarc-samx6i.conf +++ b/conf/distro/include/smarc-samx6i.conf | |||
@@ -27,20 +27,16 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | include conf/distro/include/imx6.inc | 30 | include conf/distro/include/fsl.inc |
31 | include conf/distro/include/imx6-egl.inc | ||
32 | 31 | ||
33 | DEPLOY_CONF_NAME = "Kontron SMARC-sAMX6i" | 32 | DEPLOY_CONF_NAME = "Kontron SMARC-sAMX6i" |
34 | 33 | ||
35 | KERNEL_IMAGETYPE = "uImage" | 34 | KERNEL_IMAGETYPE = "uImage" |
36 | 35 | ||
37 | BOOTFS_CONTENT = " " | ||
38 | |||
39 | MACHINE_EXTRA_INSTALL += "\ | 36 | MACHINE_EXTRA_INSTALL += "\ |
40 | kernel-devicetree \ | 37 | kernel-devicetree \ |
41 | " | 38 | " |
42 | 39 | ||
43 | KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" | 40 | KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" |
44 | 41 | ||
45 | BBMASK ?= " " | 42 | BBMASK += "meta-smx6/recipes-qt" |
46 | BBMASK .= "|meta-smx6/recipes-qt" | ||
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf index f58474e..80f4d57 100644 --- a/conf/distro/include/tegra-t18x.conf +++ b/conf/distro/include/tegra-t18x.conf | |||
@@ -27,13 +27,19 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | include conf/distro/include/tegra.inc | 30 | OLDEST_KERNEL_aarch64 = "3.18" |
31 | 31 | ||
32 | TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM" | 32 | TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM" |
33 | DISTRO_FEATURES_DEFAULT += "wayland" | 33 | DISTRO_FEATURES_DEFAULT += "wayland" |
34 | IMAGE_FSTYPES += "tar.gz" | ||
35 | |||
36 | QBSP_IMAGE_CONTENT = "\ | ||
37 | ${IMAGE_LINK_NAME}.tar.gz \ | ||
38 | Image \ | ||
39 | " | ||
34 | 40 | ||
35 | KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}' | 41 | KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}' |
36 | PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/vibrante-t186ref-linux")}' | 42 | PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186")}' |
37 | NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" | 43 | NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" |
38 | 44 | ||
39 | MACHINE_EXTRA_INSTALL += "\ | 45 | MACHINE_EXTRA_INSTALL += "\ |
@@ -53,7 +59,6 @@ MACHINE_EXTRA_INSTALL += "\ | |||
53 | virtual/libegl \ | 59 | virtual/libegl \ |
54 | virtual/libgles2 \ | 60 | virtual/libgles2 \ |
55 | libdrm-nv \ | 61 | libdrm-nv \ |
56 | asound-conf \ | ||
57 | " | 62 | " |
58 | 63 | ||
59 | PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers" | 64 | PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers" |
@@ -65,22 +70,18 @@ PREFERRED_PROVIDER_virtual/libgl ?= "tegra-drivers" | |||
65 | PREFERRED_PROVIDER_virtual/libgles1 ?= "tegra-drivers" | 70 | PREFERRED_PROVIDER_virtual/libgles1 ?= "tegra-drivers" |
66 | PREFERRED_PROVIDER_virtual/mesa ?= "tegra-drivers" | 71 | PREFERRED_PROVIDER_virtual/mesa ?= "tegra-drivers" |
67 | 72 | ||
68 | PREFERRED_PROVIDER_wayland ?= "wayland-nv" | 73 | BBMASK += "\ |
69 | PREFERRED_PROVIDER_wayland-native ?= "wayland-nv" | 74 | meta-vib4/recipes-connectivity/connman \ |
70 | PREFERRED_PROVIDER_nativesdk-wayland ?= "wayland-nv" | 75 | meta-vib4/recipes-core/toybox \ |
71 | 76 | meta-vib4/recipes-core/images \ | |
72 | BBMASK ?= " " | 77 | meta-vib4/recipes-core/packagegroups \ |
73 | BBMASK .= "\ | 78 | meta-vib4/recipes-extended \ |
74 | |meta-vib4/recipes-connectivity/connman\ | 79 | meta-vib4/recipes-multimedia/audiomanager \ |
75 | |meta-vib4/recipes-core/busybox\ | 80 | meta-vib4/recipes-core/glibc \ |
76 | |meta-vib4/recipes-core/images\ | 81 | meta-vib4/recipes-support/lvm2 \ |
77 | |meta-vib4/recipes-core/meta\ | 82 | meta-vib4/recipes-kernel/linux-libc-headers \ |
78 | |meta-vib4/recipes-core/packagegroups\ | 83 | meta-vib4/recipes-devtools/binutils \ |
79 | |meta-vib4/recipes-core/systemd/systemd\ | 84 | meta-vib4/recipes-yocto-ivi/packagegroups \ |
80 | |meta-vib4/recipes-devtools\ | 85 | meta-vib4/recipes-graphics/wayland/wayland-ivi-extension_%.bbappend \ |
81 | |meta-vib4/recipes-extended\ | 86 | meta-vib4/recipes-graphics/wayland/libinput_%.bbappend \ |
82 | |meta-vib4/recipes-multimedia/audiomanager\ | 87 | " |
83 | |meta-vib4/recipes-core/glibc\ | ||
84 | |meta-vib4/recipes-support/lvm2\ | ||
85 | |meta-vib4/recipes-kernel/linux-libc-headers\ | ||
86 | " | ||
diff --git a/conf/distro/include/tegra.inc b/conf/distro/include/tegra.inc deleted file mode 100644 index 618a634..0000000 --- a/conf/distro/include/tegra.inc +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | python set_nv_drv_version () { | ||
2 | # Boiler plate code to setup bitbake objects | ||
3 | d = e.data | ||
4 | |||
5 | nv_drv_version = d.getVar('NV_DRV_VER', True) | ||
6 | if nv_drv_version != "ignore": | ||
7 | # FIXME: When we add support to internal builds, both debug and release | ||
8 | # builds will need to be considered | ||
9 | path = d.getVar('PLATFORM_TOPDIR', True) | ||
10 | get_nv_drv_cmd = "strings " + path + "/lib-target/nvidia_drv.so \ | ||
11 | | grep -o -P '(?<=Driver ).*(?=Release)' | awk {'print $1'}" | ||
12 | # Execute cmd | ||
13 | nv_drv_version = bb.process.run(get_nv_drv_cmd)[0].strip() | ||
14 | # Store returned value in NV_DRV_VER | ||
15 | d.setVar('NV_DRV_VER', nv_drv_version) | ||
16 | } | ||
17 | |||
diff --git a/conf/distro/include/ti.inc b/conf/distro/include/ti.inc index a445dc2..4c9f803 100644 --- a/conf/distro/include/ti.inc +++ b/conf/distro/include/ti.inc | |||
@@ -27,11 +27,16 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | BBMASK ?= " " | 30 | include conf/distro/include/fsl.inc |
31 | BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5" | ||
32 | |||
33 | IMAGE_FSTYPES += "ext3 sdcard" | ||
34 | IMAGE_CLASSES += "image_types_fsl" | ||
35 | 31 | ||
36 | UBOOT_SUFFIX = "img" | 32 | UBOOT_SUFFIX = "img" |
37 | BOOT_SCRIPTS = "${BOOTFS_CONTENT}" | 33 | BOOT_SCRIPTS += "\ |
34 | MLO-${MACHINE}:MLO \ | ||
35 | u-boot-${MACHINE}.img:u-boot.img \ | ||
36 | " | ||
37 | |||
38 | EXTRA_IMAGEDEPENDS += "u-boot" | ||
39 | |||
40 | PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" | ||
41 | PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um" | ||
42 | PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" | ||
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf deleted file mode 100644 index 01e1f63..0000000 --- a/conf/distro/include/tibidabo.conf +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
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 | include conf/distro/include/imx6.inc | ||
31 | include conf/distro/include/imx6-egl.inc | ||
32 | |||
33 | DEPLOY_CONF_NAME = "ArchiTech Tibidabo" | ||
34 | |||
35 | KERNEL_IMAGETYPE = "uImage" | ||
36 | |||
37 | BOOTFS_CONTENT = "\ | ||
38 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | ||
39 | bootscript:bootscript \ | ||
40 | " | ||
41 | BOOTFS_DEPENDS = "tibidabo-bootscript-sd:do_deploy virtual/kernel:do_deploy" | ||
42 | |||
43 | # mx6 GPU libraries | ||
44 | PREFERRED_PROVIDER_virtual/egl_mx6 = "gpu-viv-bin-mx6q" | ||
45 | PREFERRED_PROVIDER_virtual/libgles1_mx6q = "gpu-viv-bin-mx6q" | ||
46 | PREFERRED_PROVIDER_virtual/libgles2_mx6q = "gpu-viv-bin-mx6q" | ||
47 | PREFERRED_PROVIDER_virtual/libgl_mx6q = "gpu-viv-bin-mx6q" | ||
48 | |||
49 | KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" | ||
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc index 647362d..d6b74e0 100644 --- a/conf/distro/include/toradex.inc +++ b/conf/distro/include/toradex.inc | |||
@@ -27,11 +27,12 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | BBMASK ?= " " | 30 | include conf/distro/include/fsl.inc |
31 | BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups|meta-toradex/recipes-core/glibc|meta-toradex/recipes-sato/webkit|meta-toradex/recipes-bsp/binary-drivers/cudatoolkit6.5|meta-toradex/recipes-bsp/binary-drivers/opencv4tegra" | ||
32 | 31 | ||
33 | PREFERRED_PROVIDER_u-boot = "u-boot-toradex" | 32 | PREFERRED_PROVIDER_u-boot = "u-boot-toradex" |
34 | 33 | ||
34 | EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-toradex" | ||
35 | |||
35 | MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}" | 36 | MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}" |
36 | BOOT_SCRIPTS += " \ | 37 | BOOT_SCRIPTS += " \ |
37 | fwd_blk.img:flash_blk.img \ | 38 | fwd_blk.img:flash_blk.img \ |