summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Holappa <teemu.holappa@theqtcompany.com>2016-02-09 13:36:35 +0200
committerTeemu Holappa <teemu.holappa@theqtcompany.com>2016-02-10 07:51:27 +0000
commit95edcb4599e092b9a95fa84e9d14e184075a31f4 (patch)
treed67657ee4b099606441bf482eab9e9d54766c019
parentd4996b8dd4fc54b3034f81c5eebbef3916cf6020 (diff)
downloadmeta-boot2qt-95edcb4599e092b9a95fa84e9d14e184075a31f4.tar.gz
Fix kms plugin build for NVidia K1 pro.
Added kms plugin to nvidia-logal configuration. Updated meta-tegra layer. In updated meta-tegra layer there is added pkg-config file for nvidia drm library to pass the KMS config tests. Changed virtual/mesa dependency to drm into qtbase receipt until it gets upstreamed. Change-Id: I1aa999865166c3a2831579c83610ac2b862b9359 Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
-rw-r--r--meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtbase_git.bbappend1
-rw-r--r--scripts/manifest.xml2
3 files changed, 3 insertions, 2 deletions
diff --git a/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend b/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend
index f2f7e11..c33ee23 100644
--- a/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend
+++ b/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend
@@ -20,4 +20,4 @@
20############################################################################## 20##############################################################################
21 21
22DEPENDS += "graphics-headers" 22DEPENDS += "graphics-headers"
23 23PACKAGECONFIG += "kms"
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index 20d5cce..c0641c1 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -48,6 +48,7 @@ SRCREV = "3880f41e683f02b905c8cbc3c578c3f3a0a1eb2e"
48 48
49# Temporarily here, until merged upstream 49# Temporarily here, until merged upstream
50PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" 50PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
51PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
51 52
52do_install_append() { 53do_install_append() {
53 # Temporarily here, until merged upstream 54 # Temporarily here, until merged upstream
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 4508fc8..3557cf0 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -75,7 +75,7 @@
75 groups="notdefault,nuc"/> 75 groups="notdefault,nuc"/>
76 <project name="meta-tegra" 76 <project name="meta-tegra"
77 remote="playground" 77 remote="playground"
78 revision="85a0974d23ebb7b276f48a2604d107252b3b9064" 78 revision="3125d29a5c58a471b67104d1bff965df38eb3115"
79 path="sources/meta-tegra" 79 path="sources/meta-tegra"
80 groups="notdefault,nvidia-logan"/> 80 groups="notdefault,nvidia-logan"/>
81 <project name="jetson-tk1-pro" 81 <project name="jetson-tk1-pro"