Merge commit 'eca7186eaa09df1870cd9d96017ddc385cffb68f' into 3g

2017-05-31 17:54:36 +02:00 · 2017-05-31 17:54:36 +02:00 · f7772a7547
parent 743c320553 eca7186eaa
commit f7772a7547
3 changed files with 5 additions and 0 deletions
--- a/meta-qt5/conf/layer.conf
+++ b/meta-qt5/conf/layer.conf
@ -14,6 +14,11 @@ BBPATH .= ":${LAYERDIR}"
 # We have a recipes directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"

+# Add hacks for dora or master..
+BBFILES_META_QT5 = "${LAYERDIR}/yocto-${@dict([('1.5', 'dora')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'master')}/*.bbappend"
+BBFILES +=  "{BBFILES_META_QT5}"
+
+
 BBFILE_COLLECTIONS += "qt5-layer"
 BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/"

--- a/meta-qt5/recipes-devtools/cmake/cmake-native_2.8.11.2.bbappend
+++ b/meta-qt5/recipes-devtools/cmake/cmake-native_2.8.11.2.bbappend
--- a/meta-qt5/recipes-devtools/cmake/cmake_2.8.11.2.bbappend
+++ b/meta-qt5/recipes-devtools/cmake/cmake_2.8.11.2.bbappend