From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Fri, 15 Jun 2018 18:08:30 +0000 (+0200)
Subject: Re-enable fix for cmake in sdk
X-Git-Tag: 5.99.1~8
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=d89ae471de67da6a1d6b392652f3622fb0f7ea4b;p=AGL%2Fmeta-agl.git

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>
---

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"