aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-distro
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-06-15 20:08:30 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-06-15 20:08:30 +0200
commitd89ae471de67da6a1d6b392652f3622fb0f7ea4b (patch)
tree082bc7145224fefaa854ad23d592a561b054d6cc /meta-agl-distro
parent7a92b0f6dcb489340d253fd24c6335d9b35f6bdc (diff)
Re-enable fix for cmake in sdk
The hotfix is still necessary as of 2018-06-15 in the meta-qt5 version we use. Change-Id: If650d3056deb604107145dc501a4ba0bf95802e3 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-distro')
-rw-r--r--meta-agl-distro/conf/distro/poky-agl.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 065baf24f..eff5def3f 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -155,5 +155,5 @@ PACKAGE_FEED_ARCHS = ""
# Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
-# (revalidate after 2017-10-15)
-#DIRFILES_pn-nativesdk-cmake = "1"
+# (revalidate after 2017-10-15, 2018-06-12: still required)
+DIRFILES_pn-nativesdk-cmake = "1"