From 4debbfc2576ee4eab618cf3a8904a024a7146ccf Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 17 Dec 2014 11:43:33 -0800
Subject: [PATCH 1/2] catalyst: update GCC dependencies before building stage1

When bootstrapping a SDK we need to update GCC dependencies to ensure
the GCC built for stage1 is linked against the same library versions as
those that are included in the stage1. Without this updating the mpc
library just results in a broken stage1.
---
 build_library/catalyst.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh
index 9fe8e692ad..47da952379 100644
--- a/build_library/catalyst.sh
+++ b/build_library/catalyst.sh
@@ -99,6 +99,7 @@ cat <<EOF
 target: stage1
 # stage1 packages aren't published, save in tmp
 pkgcache_path: ${TEMPDIR}/stage1-${ARCH}-packages
+update_seed: yes
 EOF
 catalyst_stage_default
 }

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 2/2] 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"