mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 06:01:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(update_chroot): Remove old make.conf symlinks

Browse Source 
The old static files are pretty much empty and unused now.
This commit is contained in:
Michael Marineau 2014-06-12 15:34:52 -07:00
parent 99ed29d218
commit 7f599ac764
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
update_chroot
View File

@ -54,10 +54,10 @@ COREOS_CONFIG="${COREOS_OVERLAY}/coreos/config"
info "Setting up portage..." info "Setting up portage..."
sudo mkdir -p "/etc/portage/repos.conf/" sudo mkdir -p "/etc/portage/repos.conf/"
sudo ln -sf "${COREOS_CONFIG}/make.conf.amd64-host" "/etc/portage/make.conf" sudo rm -f "/etc/portage/make.conf"
sudo touch "/etc/portage/make.conf.user" sudo touch "/etc/portage/make.conf.user"
sudo_clobber "/etc/portage/make.conf.host_setup" <<EOF sudo_clobber "/etc/portage/make.conf" <<EOF
# Created by update_chroot # Created by update_chroot
PORTDIR="${PORTAGE_STABLE_OVERLAY}" PORTDIR="${PORTAGE_STABLE_OVERLAY}"
PORTDIR_OVERLAY="${CROSSDEV_OVERLAY} ${COREOS_OVERLAY}" PORTDIR_OVERLAY="${CROSSDEV_OVERLAY} ${COREOS_OVERLAY}"
@ -70,6 +70,9 @@ MAKEOPTS="--jobs=${NUM_JOBS} --load-average=$((NUM_JOBS * 2))"
# Generally there isn't any need to add packages to @world by default. # Generally there isn't any need to add packages to @world by default.
# You can use --select to override this. # You can use --select to override this.
EMERGE_DEFAULT_OPTS="--oneshot" EMERGE_DEFAULT_OPTS="--oneshot"
# Allow the user to override or define additional settings.
source "/etc/portage/make.conf.user"
EOF EOF
sudo_clobber "/etc/portage/repos.conf/coreos.conf" <<EOF sudo_clobber "/etc/portage/repos.conf/coreos.conf" <<EOF