diff options
-rw-r--r-- | meta-boot2qt-distro/conf/distro/include/jetson.inc | 9 | ||||
-rw-r--r-- | meta-tegra-extras/recipes/drm/libdrm_%.bbappend | 15 | ||||
-rw-r--r-- | meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend | 4 | ||||
-rw-r--r-- | meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend | 37 | ||||
-rw-r--r-- | scripts/manifest.xml | 2 |
5 files changed, 3 insertions, 64 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc index e3e0292..3212cb9 100644 --- a/meta-boot2qt-distro/conf/distro/include/jetson.inc +++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | ############################################################################ | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2017 The Qt Company Ltd. | 3 | ## Copyright (C) 2018 The Qt Company Ltd. |
4 | ## Contact: https://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. |
@@ -27,8 +27,6 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | PREFERRED_PROVIDER_libdrm-tegra = "libdrm-tegra" | ||
31 | |||
32 | # use mmc0 | 30 | # use mmc0 |
33 | ROOTFS_DEVICE = "mmcblk1p1" | 31 | ROOTFS_DEVICE = "mmcblk1p1" |
34 | 32 | ||
@@ -43,8 +41,3 @@ QBSP_IMAGE_CONTENT = "\ | |||
43 | ${IMAGE_LINK_NAME}.conf \ | 41 | ${IMAGE_LINK_NAME}.conf \ |
44 | ${IMAGE_LINK_NAME}.flasher.tar.gz \ | 42 | ${IMAGE_LINK_NAME}.flasher.tar.gz \ |
45 | " | 43 | " |
46 | |||
47 | BBMASK += "\ | ||
48 | meta-tegra/recipes-graphics/drm \ | ||
49 | meta-tegra/external/openembedded-layer/recipes-support/opencv \ | ||
50 | " | ||
diff --git a/meta-tegra-extras/recipes/drm/libdrm_%.bbappend b/meta-tegra-extras/recipes/drm/libdrm_%.bbappend deleted file mode 100644 index bf4cc08..0000000 --- a/meta-tegra-extras/recipes/drm/libdrm_%.bbappend +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | inherit update-alternatives | ||
2 | |||
3 | do_install_append() { | ||
4 | mv ${D}${libdir}/libdrm.so.2.4.0 ${D}${libdir}/libdrm-freedesktop.so.2.4.0 | ||
5 | rm ${D}${libdir}/libdrm.so | ||
6 | rm ${D}${libdir}/libdrm.so.2 | ||
7 | ln -sf libdrm-freedesktop.so.2.4.0 ${D}${libdir}/libdrm.so | ||
8 | ln -sf libdrm-freedesktop.so.2.4.0 ${D}${libdir}/libdrm.so.2 | ||
9 | } | ||
10 | |||
11 | ALTERNATIVE_${PN} = "libdrm.so.2.4.0 libdrm.so.2" | ||
12 | ALTERNATIVE_LINK_NAME[libdrm.so.2.4.0] = "${libdir}/libdrm.so.2.4.0" | ||
13 | ALTERNATIVE_LINK_NAME[libdrm.so.2] = "${libdir}/libdrm.so.2" | ||
14 | ALTERNATIVE_TARGET = "${libdir}/libdrm-freedesktop.so.2.4.0" | ||
15 | ALTERNATIVE_PRIORITY = "20" | ||
diff --git a/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend b/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend index d3c4803..1450622 100644 --- a/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend +++ b/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend | |||
@@ -1,6 +1,6 @@ | |||
1 | ############################################################################ | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2017 The Qt Company Ltd. | 3 | ## Copyright (C) 2018 The Qt Company Ltd. |
4 | ## Contact: https://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. |
@@ -31,5 +31,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
31 | SRC_URI += "\ | 31 | SRC_URI += "\ |
32 | file://0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch \ | 32 | file://0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch \ |
33 | " | 33 | " |
34 | |||
35 | require recipes-kernel/linux/linux-dtb.inc | ||
diff --git a/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend b/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend deleted file mode 100644 index 84a817c..0000000 --- a/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2017 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 | PACKAGES += "${PN}-dev" | ||
31 | RRECOMMENDS_${PN}-dev += "\ | ||
32 | libgles1-mesa-dev \ | ||
33 | libgles2-mesa-dev \ | ||
34 | libgles3-mesa-dev \ | ||
35 | libegl-mesa-dev \ | ||
36 | libgl-mesa-dev \ | ||
37 | " | ||
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 0c9155b..4dfeec1 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
@@ -55,7 +55,7 @@ | |||
55 | groups="notdefault,external,intel"/> | 55 | groups="notdefault,external,intel"/> |
56 | <project name="meta-tegra" | 56 | <project name="meta-tegra" |
57 | remote="madisongh" | 57 | remote="madisongh" |
58 | revision="4aea5e3785dc400e31981467f475b54e652dbd67" | 58 | revision="6b6942c8dd15c2b4a460d46e803b962663955fde" |
59 | path="sources/meta-tegra" | 59 | path="sources/meta-tegra" |
60 | groups="notdefault,external,jetson"/> | 60 | groups="notdefault,external,jetson"/> |
61 | <project name="meta-renesas" | 61 | <project name="meta-renesas" |