From 4d78cb33b506bd66607486ccab4ebb70e8974fce Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 2 Jun 2015 16:05:02 -0700 Subject: [PATCH 1/2] sys-apps/systemd: bump to v220-coreos --- .../systemd/{systemd-219-r8.ebuild => systemd-220.ebuild} | 0 .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-219-r8.ebuild => systemd-220.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-220.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219-r8.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-220.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index 47ecdab60e..48baf79b30 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" == 9999 ]]; then # Use ~arch instead of empty keywords for compatibility with cros-workon KEYWORDS="~amd64 ~arm64 ~arm ~x86" else - CROS_WORKON_COMMIT="97aee7c7c052214617bfe13390e92e2e9fb256bf" + CROS_WORKON_COMMIT="923c912ccb38a89d0699a79120b85ab6d1ce38be" KEYWORDS="amd64 arm64 ~arm ~x86" fi From 63675cbd464b6952065080b30d2c0e2addbd873a Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 2 Jun 2015 16:19:13 -0700 Subject: [PATCH 2/2] sys-apps/systemd: apply ebuild changes from gentoo --- .../sys-apps/systemd/systemd-9999.ebuild | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index 48baf79b30..bc4ceb5c42 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.164 2015/04/18 23:54:18 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.169 2015/05/30 13:58:45 floppym Exp $ EAPI=5 @@ -533,32 +533,12 @@ pkg_postinst() { eerror fi - if [[ ! -L "${ROOT}"/etc/mtab ]]; then - ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts." - ewarn "Not having it is not supported by upstream and will cause tools like 'df'" - ewarn "and 'mount' to not work properly. Please run:" - ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" - ewarn - fi - if [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable" ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf" ewarn "to /run/systemd/resolve/resolv.conf" ewarn fi - - if ! has_version sys-apps/systemd-ui; then - elog "To get additional features, a number of optional runtime dependencies may" - elog "be installed:" - elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent" - fi - - if has_version sys-apps/openrc && - ! has_version sys-fs/udev-init-scripts; then - elog "If you plan to boot using OpenRC and udev or eudev, you" - elog "need to install the udev-init-scripts package." - fi } pkg_prerm() {