From 11deb867b8a93850f9f5ff0a2815620e3e4eefa3 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 11 Jun 2014 16:09:11 -0700 Subject: [PATCH] bump(sys-apps/baselayout): Updates for systemd --- .../{baselayout-3.0.2.ebuild => baselayout-3.0.3.ebuild} | 0 .../sys-apps/baselayout/baselayout-9999.ebuild | 7 +------ 2 files changed, 1 insertion(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.0.2.ebuild => baselayout-3.0.3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild index 95204bf6d9..65dbd29745 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild @@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="c6d25f9aa7ce2869aabcde3641dc1936c172edd1" + CROS_WORKON_COMMIT="08d3b10ab1b0d01d200189e9f405ec8e3b76aedb" KEYWORDS="amd64 arm x86" fi @@ -117,11 +117,6 @@ src_install() { systemd_dotmpfilesd "${T}/baselayout-usr.conf" fi - if use cros_host; then - # do not install networkd's resolv.conf symlink in SDK - rm "${D}"/usr/lib/tmpfiles.d/baselayout-resolv.conf || die - fi - # Fill in all other paths defined in tmpfiles configs tmpfiles_create