Merge pull request #365 from marineam/catalyst

Catalyst fixes
This commit is contained in:
Michael Marineau 2014-12-17 14:10:28 -08:00
commit ebc6dbb40b

View File

@ -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
}
@ -99,6 +101,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
}
@ -209,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"