From d1ac068b564b23088b098927e388a3a3d311ba8b Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 4 Aug 2015 14:29:34 -0700 Subject: [PATCH 1/2] coreos: require dbus to have the correct selinux use flag Prevents builds from skipping the dbus rebuild due to missing packages. --- .../{coreos-0.0.1-r259.ebuild => coreos-0.0.1-r260.ebuild} | 0 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 1 + 2 files changed, 1 insertion(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r259.ebuild => coreos-0.0.1-r260.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r259.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r260.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r259.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r260.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 9067dda548..d46f91f1e2 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -89,6 +89,7 @@ RDEPEND="${RDEPEND} # Optionally enable SELinux and pull in policy for containers RDEPEND="${RDEPEND} + sys-apps/dbus[selinux?] sys-apps/systemd[selinux?] selinux? ( sec-policy/selinux-virt From 594502446659b99ed8405969962c962916a0c555 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 4 Aug 2015 14:31:16 -0700 Subject: [PATCH 2/2] Revert "Enable selinux" This reverts commit 8c6bf0063605ecee4b82eba6c2f956f2b91af447. A required package has not been added yet: emerge: there are no ebuilds to satisfy "sec-policy/selinux-dbus" dependency required by "sys-apps/dbus-1.8.16-r1::coreos[selinux]" --- .../profiles/coreos/targets/generic/package.use | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 8c6bc7a6df..ba5b3db9e7 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 @@ -3,7 +3,6 @@ app-admin/rsyslog -ssl app-editors/vim minimal -coreos-base/coreos selinux dev-lang/python -berkdb gdbm dev-libs/dbus-glib tools dev-libs/elfutils -utils @@ -16,18 +15,15 @@ net-misc/dhcp -server net-misc/iperf threads net-misc/ntp caps sys-apps/busybox -pam -selinux -sys-apps/dbus selinux sys-apps/smartmontools minimal sys-block/parted device-mapper sys-fs/lvm2 -lvm1 -readline -sys-kernel/coreos-kernel selinux sys-libs/ncurses minimal sys-libs/pam -berkdb sys-libs/gdbm berkdb # enable journal gateway and container features, avoid pulling in gnutls -sys-apps/systemd audit importd http nat -ssl selinux - +sys-apps/systemd audit importd http nat -ssl net-libs/libmicrohttpd -ssl sys-boot/syslinux -custom-cflags