From 03a52a7f1251114c2a7a57b26a0e9ba8a92fb4ca Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 17 Sep 2013 14:30:31 -0500 Subject: 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 Signed-off-by: Joe MacDonald --- conf/distro/oe-selinux.conf | 2 +- conf/distro/poky-selinux.conf | 4 +--- 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" -- cgit v1.2.3-54-g00ecf