diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r108.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r109.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r108.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r109.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index 105b17ca11..140311cf46 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="af207c09eff3b8447d457c5e534a0b7ff3aae514" + CROS_WORKON_COMMIT="d301028d546e4a774345dab69d0429f6bc527ae0" KEYWORDS="amd64 arm arm64 x86" fi @@ -36,6 +36,7 @@ DEPEND=" test? ( dev-lang/python:2.7 ) " RDEPEND="${DEPEND} + app-admin/logrotate sys-block/parted sys-apps/gptfdisk >=sys-apps/systemd-207-r5 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index 39f3435bb7..62d4982cf4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -18,6 +18,9 @@ ETCD_PROTOCOLS="1 2" # Extra use flags for CoreOS SDK USE="${USE} cros_host expat -introspection -cups -tcpd -pcre -berkdb" +# Never install cron or cron jobs +USE="${USE} -cron" + # No need for zeroconf, that's a desktop world thing. # Namely dhcpcd shoudln't make up random ipv4 addresses using ipv4ll USE="${USE} -zeroconf" @@ -61,11 +64,9 @@ CONFIG_PROTECT=" # Remove libtool .la files for non-plugin libraries. # Remove Gentoo init files since we use systemd. -# Remove logrotate.d files since we don't use logrotate. INSTALL_MASK=" /usr/lib*/*.la /etc/init.d /etc/conf.d - /etc/logrotate.d " # Keep the default languages small. diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults index 27f71ffb43..509134dc44 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults @@ -27,6 +27,8 @@ INSTALL_MASK="${INSTALL_MASK} /etc/dmtab /etc/e2fsck.conf /etc/lvm/* + /etc/logrotate.conf + /etc/logrotate.d /etc/mdadm.conf /etc/rsyncd.conf /etc/sudoers