From aa140ca72cc7fce6d8a81c237baacab3325320e8 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 5 Mar 2014 11:25:24 -0800 Subject: [PATCH 1/2] fix(make.conf): Stop disabling assorted safety features. I don't think disabling any of these is gaining us anything and could possibly help catch or prevent assorted issues. --- .../coreos-overlay/coreos/config/make.conf.amd64-host | 3 --- .../coreos-overlay/coreos/config/make.conf.common-target | 3 --- 2 files changed, 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host index bc461ccdd2..13dedb25bb 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host @@ -4,9 +4,6 @@ source "/mnt/host/source/.repo/manifests/version.txt" COREOS_VERSION_STRING="${COREOS_BUILD}.${COREOS_BRANCH}.${COREOS_PATCH}" -# Tolerate collisions (for now), disable extra locking, ignore missing digests. -FEATURES="-collision-protect -ebuild-locks -strict" - # Since our portage comes from version control, we redirect distfiles DISTDIR="/var/lib/portage/distfiles" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target index 857480ab07..e849d3fb30 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target @@ -16,9 +16,6 @@ PORTAGE_TMPDIR=${ROOT}tmp/ PORT_LOGDIR=${ROOT}tmp/portage/logs/ -# Tolerate collisions (for now), disable extra locking, ignore missing digests. -FEATURES="-collision-protect -ebuild-locks -strict" - PORTAGE_WORKDIR_MODE="0755" PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/:${ROOT}usr/share/pkgconfig/" From 250c39b2d2326821060c1537042a05c359698bd0 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 5 Mar 2014 11:30:42 -0800 Subject: [PATCH 2/2] fix(sys-libs/glibc): Remove nsswitch.conf transitional symlink code The transition to the new baselayout is complete so this can go away. --- ...bc-2.17-r1.ebuild => glibc-2.17-r2.ebuild} | 0 .../sys-libs/glibc/glibc-2.17.ebuild | 20 ++----------------- 2 files changed, 2 insertions(+), 18 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/{glibc-2.17-r1.ebuild => glibc-2.17-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17.ebuild index b3e0178903..3d4314ac1c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17.ebuild @@ -209,23 +209,7 @@ eblit-pkg_preinst-post() { # CoreOS tweaks: # - drop host.conf and gai.conf -# - move/symlink nsswitch.conf and rpc. -# These are moving to baselayout+usrfiles and glibc shouldn't conflict +# - nsswitch.conf and rpc are provided by baselayout eblit-src_install-post() { - dodir /usr/share/glibc - local move - for move in nsswitch.conf rpc ; do - [ -f "${D}/etc/${move}" ] || continue - mv "${D}/etc/${move}" "${D}"/usr/share/glibc || die - done - rm -f "${D}"/etc/{gai.conf,host.conf} || die -} - -eblit-pkg_postinst-post() { - local sym - for sym in nsswitch.conf rpc ; do - [ ! -f "${ROOT}/etc/${sym}" ] || continue - [ -f "${ROOT}/usr/share/glibc/${sym}" ] || continue - ln -sf "../usr/share/glibc/${sym}" "${ROOT}/etc/${sym}" || die - done + rm -f "${D}"/etc/{gai.conf,host.conf,nsswitch.conf,rpc} || die }