From a16f056692a2eb99cdcf5bee896929d65d1a5d2f Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 10 Jun 2014 15:25:35 -0700 Subject: [PATCH] feat(profiles): Move portage permissions setting out of make.conf Developer friendly permissions are fine as the default in CoreOS. --- .../coreos-overlay/coreos/config/make.conf.common-target | 1 - .../coreos-overlay/profiles/coreos/base/make.defaults | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 cc5afa29ab..f292477e92 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,7 +16,6 @@ PORTAGE_TMPDIR=${ROOT}tmp/ PORT_LOGDIR=${ROOT}tmp/portage/logs/ -PORTAGE_WORKDIR_MODE="0755" PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/:${ROOT}usr/share/pkgconfig/" PORTDIR="/usr/local/portage/stable" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index 0c9a838653..d775af9b65 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -72,3 +72,6 @@ CCACHE_SIZE="2.5G" # Always build binary packages, remove old build logs, avoid running as root. FEATURES="buildpkg ccache clean-logs compressdebug parallel-install splitdebug userfetch userpriv usersandbox" + +# No need to restrict access to build directories in dev environments. +PORTAGE_WORKDIR_MODE="0755"