coreos-kernel: simplify by dropping use flags

The audit and selinux features are now always on for amd64 and always
off for arm64, we don't need to toggle this any more. Besides, tweaking
the configuration from what is provided in the defconfig has caused
confusion in the past so it isn't a great scheme to preserve.
This commit is contained in:
Michael Marineau 2016-01-06 13:42:30 -08:00
parent bbed03720e
commit c02993ec2a
3 changed files with 1 additions and 13 deletions

View File

@ -18,7 +18,7 @@ HOMEPAGE="http://www.kernel.org"
LICENSE="GPL-2 freedist"
SLOT="0/${PVR}"
SRC_URI=""
IUSE="audit selinux"
IUSE=""
DEPEND="
app-arch/gzip
@ -215,14 +215,6 @@ coreos-kernel_src_prepare() {
}
coreos-kernel_src_configure() {
if ! use audit; then
sed -i -e '/^CONFIG_CMDLINE=/s/"$/ audit=0"/' build/.config || die
fi
if ! use selinux; then
sed -i -e '/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE/d' build/.config || die
echo CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 >> build/.config || die
fi
# Use default for any options not explitly set in defconfig
kmake olddefconfig

View File

@ -2,7 +2,6 @@
coreos-base/coreos selinux
sys-apps/dbus selinux
sys-apps/systemd selinux
sys-kernel/coreos-kernel selinux
# Enable SELinux for coreutils
sys-apps/coreutils selinux

View File

@ -38,8 +38,5 @@ dev-util/pkgconfig internal-glib
# minimize risk removing unneeded patches and networking support
app-shells/bash -net vanilla
# enable audit subsystem by default
sys-kernel/coreos-kernel audit
# disable nss utilities
dev-libs/nss -utils