From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Fri, 15 Sep 2017 22:25:03 +0000 (+0200)
Subject: Fix clash in metadata of nativesdk-cmake and nativesdk-qtbase-tools
X-Git-Tag: 4.99.1~26
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F10925%2F2;p=AGL%2Fmeta-agl.git

Fix clash in metadata of nativesdk-cmake and nativesdk-qtbase-tools

This is related to the change from rpm5 to rpm4 in pyro and a slightly different behaviour when treating directories
during the packaging. Result is that both packages claim to 'own' the directory environment-setup.d .
The packager 'dnf' then reports the collision and aborts when constructing the SDK.

This is a temporary fix until the issue is resolved upstream
Reference: https://bugzilla.yoctoproject.org/show_bug.cgi?id=12093

Change-Id: I7be94e02251a8bd55a656d986654085039026bb5
Bug-AGL: SPEC-888
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10925
---

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 4931f96a8..8ca9a469a 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -133,3 +133,8 @@ INITRAMFS_FSTYPES := "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FST
 #
 # THE FUTURE is 'wic'
 # IMAGE_FSTYPES_append = " wic"
+
+
+# Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
+# (revalidate after 2017-10-15)
+DIRFILES_pn-nativesdk-cmake = "1"