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

Merge pull request #416 from flatcar/krnowak/fix-verbose-bootstrap

Browse Source 
scripts/bootstrap: fix verbose bootstrap
This commit is contained in:
Krzesimir Nowak 2023-02-17 14:32:13 +01:00 committed by GitHub
commit 8465eab673
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sdk_container/src/third_party/portage-stable/scripts/bootstrap.sh vendored
View File

@ -357,10 +357,17 @@ fi
if [[ -n ${STRAP_RUN} ]] ; then
if [[ -x ${GCC_CONFIG} ]] && ${GCC_CONFIG} --get-current-profile &>/dev/null
then
# Make sure we get the old gcc unmerged ...
${V_ECHO} emerge ${STRAP_EMERGE_OPTS} --prune sys-devel/gcc || cleanup 1
# Make sure the profile and /lib/cpp and /usr/bin/cc are valid ...
${GCC_CONFIG} "$(${GCC_CONFIG} --get-current-profile)" &>/dev/null
# Flatcar: avoid failures when bootstraping in verbose mode
output=$(${V_ECHO} emerge ${STRAP_EMERGE_OPTS} --prune --pretend --quiet sys-devel/gcc 2>/dev/null)
if [[ ${DEBUG} = "1" ]] ; then
echo "${output}"
fi
if [[ "${output}" = *'All selected packages:'* ]] ; then
# Make sure we get the old gcc unmerged ...
${V_ECHO} emerge ${STRAP_EMERGE_OPTS} --prune sys-devel/gcc || cleanup 1
# Make sure the profile and /lib/cpp and /usr/bin/cc are valid ...
${GCC_CONFIG} "$(${GCC_CONFIG} --get-current-profile)" &>/dev/null
fi
fi
fi