6 files changed, 35 insertions, 22 deletions
diff --git a/meta-agl-core/conf/include/agl-create-spdx.inc b/meta-agl-core/conf/include/agl-create-spdx.inc
new file mode 100644
index 000000000..8d71013e3
--- /dev/null
+++ b/meta-agl-core/conf/include/agl-create-spdx.inc
@@ -0,0 +1 @@
+INHERIT += " create-spdx "
diff --git a/meta-agl-core/conf/include/agl-devel.inc b/meta-agl-core/conf/include/agl-devel.inc
index 919f066a7..055fa61e3 100644
--- a/meta-agl-core/conf/include/agl-devel.inc
+++ b/meta-agl-core/conf/include/agl-devel.inc
@@ -1,18 +1,16 @@
 IMAGE_FEATURES =+ "debug-tweaks tools-debug tools-profile"
 
-IMAGE_INSTALL_append = " \
+IMAGE_INSTALL:append = " \
     packagegroup-agl-core-devel \
 "
 
 # Install libdrm-test, including modetest, to images with GUI
-IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libdrm-tests', '', d)}"
-
-IMAGE_FEATURES_append = " agl-devel-wgt"
+IMAGE_INSTALL:append = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libdrm-tests', '', d)}"
 
 # disable install of debug files in SDK
 # initial value: SDKIMAGE_FEATURES="dev-pkgs dbg-pkgs staticdev-pkgs"
 SDKIMAGE_FEATURES="dev-pkgs"
 
 # allows insertion of code or items specific to developement
-OVERRIDES .= ":agl-devel"
-DISTRO_FEATURES_append = " agl-devel"
+OVERRIDES:append = ":agl-devel"
+DISTRO_FEATURES:append = " agl-devel"
diff --git a/meta-agl-core/conf/include/agl-gplv2.inc b/meta-agl-core/conf/include/agl-gplv2.inc
deleted file mode 100644
index fc9a4072b..000000000
--- a/meta-agl-core/conf/include/agl-gplv2.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-# GPLv3 Compliance
-PREFERRED_VERSION_bash          = "3.2.%"
-PREFERRED_VERSION_gawk          = "3.1.%"
-PREFERRED_VERSION_gdbm          = "1.8.%"
-PREFERRED_VERSION_gnupg         = "1.4.7"
-PREFERRED_VERSION_gnutls        = "3.3.%"
-PREFERRED_VERSION_mc            = "4.7.5.%"
-PREFERRED_VERSION_readline      = "5.2"
diff --git a/meta-agl-core/conf/include/agl-package-management.inc b/meta-agl-core/conf/include/agl-package-management.inc
new file mode 100644
index 000000000..9acf439c2
--- /dev/null
+++ b/meta-agl-core/conf/include/agl-package-management.inc
@@ -0,0 +1,6 @@
+# Enable package management
+IMAGE_FEATURES =+ "package-management"
+PACKAGE_FEED_URIS = "http://192.168.7.1:8000/tmp/deploy/"
+PACKAGE_FEED_BASE_PATHS = "rpm"
+PACKAGE_FEED_ARCHS = ""
+#${PACKAGE_ARCHS}"
diff --git a/meta-agl-core/conf/include/agl-selinux.inc b/meta-agl-core/conf/include/agl-selinux.inc
new file mode 100644
index 000000000..aeb26e33d
--- /dev/null
+++ b/meta-agl-core/conf/include/agl-selinux.inc
@@ -0,0 +1,20 @@
+DISTRO_FEATURES:append = " acl xattr selinux"
+
+# Reiterate the upstream default of targeted policy since that
+# is the mostly widely used model, and it will likely be easier
+# to pull policy from other distributions for it.
+# Having an explicit setting here seems useful for documentation
+# purposes, and it is still possible that using one of the other
+# refpolicy package options as the AGL default desirable, and it
+# would be set here.
+PREFERRED_PROVIDER_virtual/refpolicy ?= "refpolicy-targeted"
+
+# Default to permissive mode
+DEFAULT_ENFORCING ?= "permissive"
+
+# Override the base image class to get the SELinux labeling hook
+AGL_BASE_IMAGE ?= "selinux-image"
+
+# Mask out meta-selinux's linux-yocto kernel config bbappend to
+# avoid collision with AGL's own more universal scheme.
+BBMASK += "meta-selinux/recipes-kernel/linux/"
+\ No newline at end of file
diff --git a/meta-agl-core/conf/include/base-agl.inc b/meta-agl-core/conf/include/base-agl.inc
index 5ca723a10..30bfc93d3 100644
--- a/meta-agl-core/conf/include/base-agl.inc
+++ b/meta-agl-core/conf/include/base-agl.inc
@@ -1,17 +1,13 @@
-# AGL includes all kernel modules here for ease-of-use during development.
-# Comment this out to be able to select the kernel modules yourself.
-IMAGE_INSTALL_append = " kernel-modules"
-
-# Likewise as we included all kernel modules by default in the filesystem,
-# we do not need a separate tarball stored.
+# Disable kernel module tarballs by default on the assumption that
+# desired modules will already be present in images.
 # Comment this out to receive the separate modules tarball again.
 MODULE_TARBALL_DEPLOY ?= "0"
 
 # Comment out below if want to use QtWebkit
-PACKAGECONFIG_remove_pn-qtquick1 = "webkit"
+PACKAGECONFIG:remove:pn-qtquick1 = "webkit"
 
 
-ASSUME_PROVIDED_remove = "tar-native"
+ASSUME_PROVIDED:remove = "tar-native"
 
 # Use static IDs to enable full-filesystem updates
 USERADDEXTENSION = "useradd-staticids"