From d89ae471de67da6a1d6b392652f3622fb0f7ea4b Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Fri, 15 Jun 2018 20:08:30 +0200 Subject: Re-enable fix for cmake in sdk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- meta-agl-distro/conf/distro/poky-agl.conf | 4 ++-- 1 file 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" -- cgit 1.2.3-korg