agl-selinux: pull in meta-clang

[AGL/meta-agl.git] / meta-agl-core / conf / distro / poky-agl.conf

diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index 19a21ad..266a06d 100644 (file)
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -106,11 +106,6 @@ CONNECTIVITY_CHECK_URIS ?= ""
 # Not yet upstreamed; should be submitted.
 SECURITY_CFLAGS:pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}"
 
-#Redefined USER_CLASSES
-#Disable prelink. It is unmaintained and likely will go away.
-#default: USER_CLASSES ?= "buildstats image-prelink"
-USER_CLASSES = "buildstats"
-
 # AGL uses 4 optimization levels
 # 2 for ARM 32bit 
 #   - a high and a medium setting for the CCARGS
@@ -146,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"
-