From 76bb74f07db0e1c2417d22c0f8058a51b4432530 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Sat, 16 Sep 2017 00:25:03 +0200 Subject: Fix clash in metadata of nativesdk-cmake and nativesdk-qtbase-tools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10925 --- meta-agl-distro/conf/distro/poky-agl.conf | 5 +++++ 1 file changed, 5 insertions(+) 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" -- cgit 1.2.3-korg