From 019a8a8422a277bb7d2996976be1c63c882ebf4a Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 29 Nov 2016 17:03:45 -0800 Subject: [PATCH] app-emulation/runc: Drop libselinux rdepend and only use selinux on amd64 There's no dependency here - runc does appropriate setup directly, not with cgo. In addition, ensure that selinux is only enabled on amd64. We don't support it on arm64 right now. --- ..._p20160615-r2.ebuild => runc-1.0.0_rc1_p20160615-r3.ebuild} | 3 +-- .../coreos-overlay/profiles/coreos/amd64/generic/package.use | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/runc/{runc-1.0.0_rc1_p20160615-r2.ebuild => runc-1.0.0_rc1_p20160615-r3.ebuild} (94%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc1_p20160615-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc1_p20160615-r3.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc1_p20160615-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc1_p20160615-r3.ebuild index 58ae3177cc..9f94adad5c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc1_p20160615-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc1_p20160615-r3.ebuild @@ -21,13 +21,12 @@ KEYWORDS="amd64 arm64" LICENSE="Apache-2.0" SLOT="0" -IUSE="apparmor +selinux +seccomp" +IUSE="apparmor selinux +seccomp" DEPEND="" RDEPEND=" apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) - selinux? ( sys-libs/libselinux ) " src_prepare() { 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 aaa8b12859..09246476c9 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 @@ -5,3 +5,6 @@ sys-apps/systemd selinux # Enable SELinux for coreutils sys-apps/coreutils selinux + +# Enable SELinux for runc +app-emulation/runc selinux