From 1677194dcca9e0c3e351cba686206497f06e527d Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 9 Apr 2018 10:43:18 +0300
Subject: tegra: update to L4T 28.2

Task-number: QTBUG-67257
Change-Id: I1c47ac72d4c4105e11d81b96f987f59bd07b7e10
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 meta-boot2qt-distro/conf/distro/include/jetson.inc     |  5 +++++
 meta-tegra-extras/recipes/drm/libdrm_%.bbappend        | 15 +++++++++++++++
 meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend |  2 ++
 scripts/manifest.xml                                   |  2 +-
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 meta-tegra-extras/recipes/drm/libdrm_%.bbappend

diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc
index 98c71f4..bb1859c 100644
--- a/meta-boot2qt-distro/conf/distro/include/jetson.inc
+++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc
@@ -42,3 +42,8 @@ QBSP_IMAGE_CONTENT = "\
     ${IMAGE_LINK_NAME}.img \
     ${IMAGE_LINK_NAME}.conf \
     "
+
+BBMASK += "\
+    meta-tegra/recipes-graphics/drm \
+    meta-tegra/external/openembedded-layer/recipes-support/opencv \
+    "
diff --git a/meta-tegra-extras/recipes/drm/libdrm_%.bbappend b/meta-tegra-extras/recipes/drm/libdrm_%.bbappend
new file mode 100644
index 0000000..bf4cc08
--- /dev/null
+++ b/meta-tegra-extras/recipes/drm/libdrm_%.bbappend
@@ -0,0 +1,15 @@
+inherit update-alternatives
+
+do_install_append() {
+    mv ${D}${libdir}/libdrm.so.2.4.0 ${D}${libdir}/libdrm-freedesktop.so.2.4.0
+    rm ${D}${libdir}/libdrm.so
+    rm ${D}${libdir}/libdrm.so.2
+    ln -sf libdrm-freedesktop.so.2.4.0 ${D}${libdir}/libdrm.so
+    ln -sf libdrm-freedesktop.so.2.4.0 ${D}${libdir}/libdrm.so.2
+}
+
+ALTERNATIVE_${PN} = "libdrm.so.2.4.0 libdrm.so.2"
+ALTERNATIVE_LINK_NAME[libdrm.so.2.4.0] = "${libdir}/libdrm.so.2.4.0"
+ALTERNATIVE_LINK_NAME[libdrm.so.2] = "${libdir}/libdrm.so.2"
+ALTERNATIVE_TARGET = "${libdir}/libdrm-freedesktop.so.2.4.0"
+ALTERNATIVE_PRIORITY = "20"
diff --git a/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend b/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend
index db152a3..d3c4803 100644
--- a/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend
+++ b/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend
@@ -31,3 +31,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "\
     file://0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch \
     "
+
+require recipes-kernel/linux/linux-dtb.inc
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 86c1dd7..83cf64c 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -60,7 +60,7 @@
            groups="notdefault,external,intel"/>
   <project name="meta-tegra"
            remote="madisongh"
-           revision="34ddb90840f9bb895cd5d275922d153e35620fa3"
+           revision="4aea5e3785dc400e31981467f475b54e652dbd67"
            path="sources/meta-tegra"
            groups="notdefault,external,jetson"/>
   <project name="meta-renesas"
-- 
cgit v1.2.3-54-g00ecf