From 3b40989d529dce70a638b05cb3c244c3576bfbc5 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 17 Dec 2014 12:22:20 -0800
Subject: [PATCH] catalyst: make sure the 'portage' user can write to distfiles
 and ccache

Adding the update step appears to break permissions on the distfiles
directory. Ensure the portage user is correct and set the permissions on
directories it needs to write to in advance.
---
 build_library/catalyst.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh
index 47da952379..a67da7f315 100644
--- a/build_library/catalyst.sh
+++ b/build_library/catalyst.sh
@@ -75,6 +75,8 @@ cat <<EOF
 export TERM='${TERM}'
 export MAKEOPTS='--jobs=${NUM_JOBS} --load-average=${load}'
 export EMERGE_DEFAULT_OPTS="\$MAKEOPTS"
+export PORTAGE_USERNAME=portage
+export PORTAGE_GRPNAME=portage
 EOF
 }
 
@@ -210,7 +212,8 @@ write_configs() {
     export CCACHE_DIR="$TEMPDIR/ccache"
 
     info "Creating output directories..."
-    mkdir -p "$TEMPDIR" "$DISTDIR" "$CCACHE_DIR"
+    mkdir -m 775 -p "$TEMPDIR" "$DISTDIR" "$CCACHE_DIR"
+    chown portage:portage "$DISTDIR" "$CCACHE_DIR"
     info "Writing out catalyst configs..."
     info "    $TEMPDIR/catalyst.conf"
     catalyst_conf > "$TEMPDIR/catalyst.conf"