diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-01 09:43:22 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-12 12:34:50 +0000 |
commit | ae2d6d14123d0eae08b04e9e31bdd129aff119e6 (patch) | |
tree | 644c68739a558794241095f79a92df1f0b9c4e00 /conf | |
parent | adc61820f15efe4e57e9089372e55ad20aaf1efb (diff) | |
download | meta-boot2qt-ae2d6d14123d0eae08b04e9e31bdd129aff119e6.tar.gz |
toradex: stop using meta-toradex
All needed toradex recipes are now in meta-fsl-arm-extra
Change-Id: I3eedacd83845087d2369cf4d4b6df2a030d6d283
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/bblayers.conf.sample | 2 | ||||
-rw-r--r-- | conf/bblayers.conf.toradex.sample | 54 | ||||
-rw-r--r-- | conf/distro/include/apalis-imx6.conf | 1 | ||||
-rw-r--r-- | conf/distro/include/colibri-imx6.conf | 1 | ||||
-rw-r--r-- | conf/distro/include/colibri-imx7.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/colibri-vf.conf | 8 | ||||
-rw-r--r-- | conf/distro/include/toradex.inc | 56 |
7 files changed, 0 insertions, 124 deletions
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index 6bd83c8..95b4e3f 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample | |||
@@ -43,14 +43,12 @@ BBLAYERS ?= " \ | |||
43 | ${BSPDIR}/sources/meta-beagleboard/common-bsp \ | 43 | ${BSPDIR}/sources/meta-beagleboard/common-bsp \ |
44 | ${BSPDIR}/sources/meta-ti \ | 44 | ${BSPDIR}/sources/meta-ti \ |
45 | ${BSPDIR}/sources/meta-raspberrypi \ | 45 | ${BSPDIR}/sources/meta-raspberrypi \ |
46 | ${BSPDIR}/sources/meta-toradex \ | ||
47 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 46 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
48 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ | 47 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ |
49 | ${BSPDIR}/sources/meta-boot2qt \ | 48 | ${BSPDIR}/sources/meta-boot2qt \ |
50 | ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \ | 49 | ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \ |
51 | ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \ | 50 | ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \ |
52 | ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \ | 51 | ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \ |
53 | ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \ | ||
54 | ${BSPDIR}/sources/meta-mingw \ | 52 | ${BSPDIR}/sources/meta-mingw \ |
55 | ${BSPDIR}/sources/meta-qt5 \ | 53 | ${BSPDIR}/sources/meta-qt5 \ |
56 | " | 54 | " |
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample deleted file mode 100644 index 9472025..0000000 --- a/conf/bblayers.conf.toradex.sample +++ /dev/null | |||
@@ -1,54 +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 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf | ||
31 | # changes incompatibly | ||
32 | POKY_BBLAYERS_CONF_VERSION = "2" | ||
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-poky \ | ||
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 | " | ||
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index fdc211d..58bcdba 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf | |||
@@ -27,7 +27,6 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | include conf/distro/include/toradex.inc | ||
31 | include conf/distro/include/imx6.inc | 30 | include conf/distro/include/imx6.inc |
32 | include conf/distro/include/imx6-egl.inc | 31 | include conf/distro/include/imx6-egl.inc |
33 | 32 | ||
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index 6427ee9..eabaf91 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf | |||
@@ -27,7 +27,6 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | include conf/distro/include/toradex.inc | ||
31 | include conf/distro/include/imx6.inc | 30 | include conf/distro/include/imx6.inc |
32 | include conf/distro/include/imx6-egl.inc | 31 | include conf/distro/include/imx6-egl.inc |
33 | 32 | ||
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf index 722da17..193e6aa 100644 --- a/conf/distro/include/colibri-imx7.conf +++ b/conf/distro/include/colibri-imx7.conf | |||
@@ -20,8 +20,6 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | include conf/distro/include/toradex.inc | ||
24 | |||
25 | DEPLOY_CONF_NAME = "Toradex Colibri iMX7" | 23 | DEPLOY_CONF_NAME = "Toradex Colibri iMX7" |
26 | 24 | ||
27 | IMAGE_FSTYPES += "ext3 sdcard" | 25 | IMAGE_FSTYPES += "ext3 sdcard" |
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index db970fd..e4fdd93 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf | |||
@@ -27,14 +27,6 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | include conf/distro/include/toradex.inc | ||
31 | |||
32 | BBMASK += "\ | ||
33 | meta-fsl-arm-extra/recipes-kernel/kernel-module-mcc-toradex \ | ||
34 | meta-fsl-arm-extra/recipes-kernel/kernel-modules/kernel-module-mcc_2.1.01.bb \ | ||
35 | meta-fsl-arm-extra/recipes-bsp/mqxboot \ | ||
36 | " | ||
37 | |||
38 | DEPLOY_CONF_NAME = "Toradex Colibri VF" | 30 | DEPLOY_CONF_NAME = "Toradex Colibri VF" |
39 | 31 | ||
40 | IMAGE_FSTYPES += "ext3 sdcard" | 32 | IMAGE_FSTYPES += "ext3 sdcard" |
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc deleted file mode 100644 index 54df01a..0000000 --- a/conf/distro/include/toradex.inc +++ /dev/null | |||
@@ -1,56 +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 | BBMASK += "\ | ||
31 | meta-toradex/recipes-mozilla \ | ||
32 | meta-toradex/recipes-browser \ | ||
33 | meta-toradex/recipes-lxde \ | ||
34 | meta-toradex/recipes-connectivity \ | ||
35 | meta-toradex/recipes-gnome \ | ||
36 | meta-toradex/recipes/trdx-config \ | ||
37 | meta-toradex/recipes-multimedia/webm \ | ||
38 | meta-toradex/recipes-qt \ | ||
39 | meta-toradex/recipes-core/psplash \ | ||
40 | meta-toradex/recipes-support/florence \ | ||
41 | meta-toradex/recipes-core/systemd \ | ||
42 | meta-toradex/recipes-efl \ | ||
43 | meta-toradex/recipes-core/dropbear \ | ||
44 | meta-toradex/recipes-support/icu \ | ||
45 | meta-toradex/recipes-support/i2c-tools \ | ||
46 | meta-toradex/recipes-benchmark \ | ||
47 | meta-toradex/recipes-core/udev \ | ||
48 | meta-toradex/recipes-support/gnutls \ | ||
49 | meta-toradex/recipes-graphics/gpu-viv-bin-mx6q \ | ||
50 | meta-toradex/recipes-multimedia/gstreamer \ | ||
51 | meta-toradex/recipes-fsl/packagegroups \ | ||
52 | meta-toradex/recipes-core/glibc \ | ||
53 | meta-toradex/recipes-sato/webkit \ | ||
54 | meta-toradex/recipes-bsp/binary-drivers/cudatoolkit6.5 \ | ||
55 | meta-toradex/recipes-bsp/binary-drivers/opencv4tegra \ | ||
56 | " | ||