From 7172e40cd7fa44e14f1121a244cbd67d3a007ec1 Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Tue, 2 Mar 2021 13:52:48 +0100 Subject: [PATCH] scripts/bootstrap: flatcar: use python3; add static-libs, openmp This change explicitly calls python3 (instead of python) in pycmd so portage commands work (as we ship python 2, too, and it's still the default). Also, 'static-libs' and 'opempn' are added to the bootstrap emerge USE flags (stage 3 of the bootstrap-sh script, which is run in stage 2 of the SDK catalyst bootstrapping process): - 'static-libs' un-breaks the zlib build: zlib installed has this flag set and zlib requested per emerge command line in bootstrap.sh stage 3 needs this flag to prevent a slot conflict. - 'openmp' is to honor requirements of newer versions of GCC and is added according to Gentoo guidelines published here: https://wiki.gentoo.org/wiki/User:Sakaki/Sakaki%27s_EFI_Install_Guide/Building_the_Gentoo_Base_System_Minus_Kernel#Gentoo_Bootstrap_Remix:_Progressing_from_Stage_1_to_Stage_2 Signed-off-by: Thilo Fromm --- .../src/third_party/portage-stable/scripts/bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/scripts/bootstrap.sh b/sdk_container/src/third_party/portage-stable/scripts/bootstrap.sh index 46026a79e1..cbc7980eba 100755 --- a/sdk_container/src/third_party/portage-stable/scripts/bootstrap.sh +++ b/sdk_container/src/third_party/portage-stable/scripts/bootstrap.sh @@ -168,8 +168,8 @@ cleanup() { } pycmd() { - [[ ${DEBUG} = "1" ]] && echo /usr/bin/python -c "$@" > /dev/stderr - /usr/bin/python -c "$@" + [[ ${DEBUG} = "1" ]] && echo /usr/bin/python3 -c "$@" > /dev/stderr + /usr/bin/python3 -c "$@" } # TSTP messes ^Z of bootstrap up, so we don't trap it anymore. @@ -319,7 +319,7 @@ if [ ${BOOTSTRAP_STAGE} -le 1 ] ; then echo ------------------------------------------------------------------------------- set_bootstrap_stage 2 fi -export USE="-* bootstrap ${ALLOWED_USE} ${BOOTSTRAP_USE}" +export USE="-* bootstrap ${ALLOWED_USE} ${BOOTSTRAP_USE} openmp static-libs" # We can't unmerge headers which may or may not exist yet. If your # trying to use nptl, it may be needed to flush out any old headers