From c02993ec2aef992ad5db0b460b1f8c5bd6839524 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 6 Jan 2016 13:42:30 -0800 Subject: [PATCH] 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. --- .../coreos-overlay/eclass/coreos-kernel.eclass | 10 +--------- .../profiles/coreos/amd64/generic/package.use | 1 - .../profiles/coreos/targets/generic/package.use | 3 --- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass index c8c00466a9..aeb063c2e2 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use index 5032cf1bb0..aaa8b12859 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use index 0a3deb5bb6..8ce54cb4d1 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use @@ -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