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

Merge pull request #234 from flatcar-linux/jepio/stage2-openssl-update

Browse Source 
script/bootstrap: update openssl before stage3. This is to prevent packages from
being rebuilt against openssl-1.1 in stage3, which would require an `emerge @preserved-rebuild`
to resolve.
This commit is contained in:
Jeremi Piotrowski 2021-11-04 09:28:50 +01:00 committed by GitHub
commit f12f3a05a5
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,6 +278,8 @@ for atom in portage.settings.packages:
[[ -z ${myNCURSES} ]] && myNCURSES="sys-libs/ncurses" [[ -z ${myNCURSES} ]] && myNCURSES="sys-libs/ncurses"
# Flatcar: install curl with BOOTSTRAP_USE=ssl to fetch from https URLs # Flatcar: install curl with BOOTSTRAP_USE=ssl to fetch from https URLs
[[ -z ${myCURL} ]] && myCURL="net-misc/curl" [[ -z ${myCURL} ]] && myCURL="net-misc/curl"
# Flatcar: upgrade to openssl-3 before system rebuild in stage3
[[ -z ${myOPENSSL} ]] && myOPENSSL="dev-libs/openssl"
# Do we really want gettext/nls? # Do we really want gettext/nls?
[[ ${USE_NLS} != 1 ]] && myGETTEXT= [[ ${USE_NLS} != 1 ]] && myGETTEXT=
@ -300,6 +302,7 @@ einfo "Using texinfo : ${myTEXINFO}"
einfo "Using zlib : ${myZLIB}" einfo "Using zlib : ${myZLIB}"
einfo "Using ncurses : ${myNCURSES}" einfo "Using ncurses : ${myNCURSES}"
einfo "Using curl : ${myCURL}" einfo "Using curl : ${myCURL}"
einfo "Using openssl : ${myOPENSSL}"
echo ------------------------------------------------------------------------------- echo -------------------------------------------------------------------------------
show_status 1 Configuring environment show_status 1 Configuring environment
echo ------------------------------------------------------------------------------- echo -------------------------------------------------------------------------------
@ -339,6 +342,8 @@ if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then
STRAP_EMERGE_POSARGS="\ STRAP_EMERGE_POSARGS="\
${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \ ${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \
${myGCC} ${myLIBC} ${myCURL} ${myBASELAYOUT} ${myZLIB}" ${myGCC} ${myLIBC} ${myCURL} ${myBASELAYOUT} ${myZLIB}"
# Flatcar
STRAP_EMERGE_POSARGS="${STRAP_EMERGE_POSARGS} ${myOPENSSL}"
fi fi
${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${STRAP_EMERGE_POSARGS} || cleanup 1 ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${STRAP_EMERGE_POSARGS} || cleanup 1
echo ------------------------------------------------------------------------------- echo -------------------------------------------------------------------------------