summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-09-23 16:53:09 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-10-03 18:25:16 +0200
commit2b424611e043c549f9d0fb28ee9e12c3affef6c4 (patch)
tree9db716be248a138d1edc4c737a0a42e857ec6100
parentf5af3d15cf1d37ad486943daa6e6f8d78c3b2191 (diff)
qt5 toolchain: include python json module in the native sdk
As several customers reported qtcreator imports that python module when debugging. https://www.toradex.com/community/questions/11201/qt-creator-debugging-python-issue-colibri-imx7d.html Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--conf/layer.conf8
-rw-r--r--qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend1
2 files changed, 9 insertions, 0 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 3f070c0..d80ef67 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,6 +8,14 @@ BBFILE_COLLECTIONS += "toradex-demos"
BBFILE_PATTERN_toradex-demos = "^${LAYERDIR}/"
BBFILE_PRIORITY_toradex-demos = "90"
+# Let us add layer-specific bbappends which are only applied when that
+# layer is included in our configuration
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+ for layer in BBFILE_COLLECTIONS.split())}"
+# Add layer-specific bb files too
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bb' % layer \
+ for layer in BBFILE_COLLECTIONS.split())}"
+
LAYERDEPENDS_toradex-demos = " \
core \
openembedded-layer gnome-layer multimedia-layer networking-layer \
diff --git a/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend b/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend
new file mode 100644
index 0000000..2d005a5
--- /dev/null
+++ b/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend
@@ -0,0 +1 @@
+RDEPENDS_${PN} += "nativesdk-python3-json"