From 4b0b3dc2ec18cecd564e047eee3656d8cceec6f0 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 24 Mar 2014 21:44:25 -0700 Subject: [PATCH] bump(sys-apps/baselayout): Include new sudo configuration --- .../profiles/coreos/targets/generic/make.defaults | 5 +++++ ...aselayout-3.0.0-r8.ebuild => baselayout-3.0.0-r10.ebuild} | 0 .../sys-apps/baselayout/baselayout-3.0.0-r9.ebuild | 1 - .../sys-apps/baselayout/baselayout-9999.ebuild | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.0.0-r8.ebuild => baselayout-3.0.0-r10.ebuild} (100%) delete mode 120000 sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r9.ebuild 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 b0734a30e1..f8a2f39eb2 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 @@ -45,5 +45,10 @@ PROD_INSTALL_MASK="${PROD_INSTALL_MASK} /usr/share/nmap " +# Exclude assorted config files that we can do without +PROD_INSTALL_MASK="${PROD_INSTALL_MASK} + /etc/sudoers +" + # No suffix for 'generic' (use base, not base-usr) COREOS_DISK_LAYOUT_SUFFIX="" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r10.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r8.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r10.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r9.ebuild deleted file mode 120000 index 512b17810f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r9.ebuild +++ /dev/null @@ -1 +0,0 @@ -baselayout-9999.ebuild \ No newline at end of file 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 338b9364c4..69d4e6b063 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="ee76f682e03496fdf72d0ad16a622fbc7f37d158" + CROS_WORKON_COMMIT="aa12816e0637a2ef800854e7343246d6a8177dd9" KEYWORDS="amd64 arm x86" fi