distro/*: Update the distro files

Make the oe-selinux.conf the base configuration file.

Ensure that we enable acl and xattr support as well.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>

2 files changed, 2 insertions, 4 deletions

diff --git a/conf/distro/oe-selinux.conf b/conf/distro/oe-selinux.conf
index 5ae2179..6e55a32 100644
--- a/conf/distro/oe-selinux.conf
+++ b/conf/distro/oe-selinux.conf
@@ -1,4 +1,4 @@
 DISTRO = "oe-selinux"
 DISTROOVERRIDES .= ":selinux"
 
-DISTRO_FEATURES_append = " pam selinux"
+DISTRO_FEATURES_append = " acl xattr pam selinux"
diff --git a/conf/distro/poky-selinux.conf b/conf/distro/poky-selinux.conf
index 462f577..fb5dc09 100644
--- a/conf/distro/poky-selinux.conf
+++ b/conf/distro/poky-selinux.conf
@@ -1,6 +1,4 @@
 require conf/distro/poky.conf
+require conf/distro/oe-selinux.conf
 
 DISTRO = "poky-selinux"
-DISTROOVERRIDES = "poky:selinux"
-
-DISTRO_FEATURES_append = " pam selinux"