From aa140ca72cc7fce6d8a81c237baacab3325320e8 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 5 Mar 2014 11:25:24 -0800 Subject: [PATCH] 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/"