From eca7186eaa09df1870cd9d96017ddc385cffb68f Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 May 2017 16:25:46 +0800 Subject: [PATCH] cmake: Place the bbappend only for dora builds Not sure if they are needed for pyro but this layer will be rarely used with pyro but need to continue to work for dora. This could work. --- conf/layer.conf | 5 +++++ .../cmake => yocto-dora}/cmake-native_2.8.11.2.bbappend | 0 .../cmake => yocto-dora}/cmake_2.8.11.2.bbappend | 0 3 files changed, 5 insertions(+) rename {recipes-devtools/cmake => yocto-dora}/cmake-native_2.8.11.2.bbappend (100%) rename {recipes-devtools/cmake => yocto-dora}/cmake_2.8.11.2.bbappend (100%) diff --git a/conf/layer.conf b/conf/layer.conf index aacfd7843d..1549fd62f1 100644 --- a/conf/layer.conf +++ b/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}/" diff --git a/recipes-devtools/cmake/cmake-native_2.8.11.2.bbappend b/yocto-dora/cmake-native_2.8.11.2.bbappend similarity index 100% rename from recipes-devtools/cmake/cmake-native_2.8.11.2.bbappend rename to yocto-dora/cmake-native_2.8.11.2.bbappend diff --git a/recipes-devtools/cmake/cmake_2.8.11.2.bbappend b/yocto-dora/cmake_2.8.11.2.bbappend similarity index 100% rename from recipes-devtools/cmake/cmake_2.8.11.2.bbappend rename to yocto-dora/cmake_2.8.11.2.bbappend