poky-agl: remove outdated workarounds

Remove old workarounds from the poky-agl distro configuration that
no longer seem required:
- cmake DIRFILES tweak (SPEC-888). This actually seems to break
  cmake-native packaging during crosssdk building with scarthgap.
- do_package_write_rpm task vardepsexclude tweak (SPEC-1629).
  Based on some local tests with sstate, the original issue seems
  to have been fixed.

Bug-AGL: SPEC-4578

Change-Id: I898da1113ce74c5b899c9c943224598b0cc68289
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index 1833c25..266a06d 100644 (file)
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -141,13 +141,3 @@ AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz"
 IMAGE_FSTYPES = "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}"
 INITRAMFS_FSTYPES = "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTYPES}"
 #
-
-# Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
-# (revalidate after 2017-10-15, 2018-06-12: still required)
-DIRFILES:pn-nativesdk-cmake = "1"
-
-# For https://jira.automotivelinux.org/browse/SPEC-1629 :
-# We exclude the conflicting vars from the sstate task hash.
-# This needs to be verified.
-do_package_write_rpm[vardepsexclude] += "ARCHIVER_TOPDIR PF"
-