mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-12 15:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #365 from marineam/catalyst

Browse Source 
Catalyst fixes
This commit is contained in:
Michael Marineau 2014-12-17 14:10:28 -08:00
commit ebc6dbb40b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_library/catalyst.sh
View File

@ -75,6 +75,8 @@ cat <<EOF
export TERM='${TERM}' export TERM='${TERM}'
export MAKEOPTS='--jobs=${NUM_JOBS} --load-average=${load}' export MAKEOPTS='--jobs=${NUM_JOBS} --load-average=${load}'
export EMERGE_DEFAULT_OPTS="\$MAKEOPTS" export EMERGE_DEFAULT_OPTS="\$MAKEOPTS"
export PORTAGE_USERNAME=portage
export PORTAGE_GRPNAME=portage
EOF EOF
} }
@ -99,6 +101,7 @@ cat <<EOF
target: stage1 target: stage1
# stage1 packages aren't published, save in tmp # stage1 packages aren't published, save in tmp
pkgcache_path: ${TEMPDIR}/stage1-${ARCH}-packages pkgcache_path: ${TEMPDIR}/stage1-${ARCH}-packages
update_seed: yes
EOF EOF
catalyst_stage_default catalyst_stage_default
} }
@ -209,7 +212,8 @@ write_configs() {
export CCACHE_DIR="$TEMPDIR/ccache" export CCACHE_DIR="$TEMPDIR/ccache"
info "Creating output directories..." 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 "Writing out catalyst configs..."
info " $TEMPDIR/catalyst.conf" info " $TEMPDIR/catalyst.conf"
catalyst_conf > "$TEMPDIR/catalyst.conf" catalyst_conf > "$TEMPDIR/catalyst.conf"