[gentoo-commits] repo/gentoo:master commit in: scripts/

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Jorge Manuel B. S. Vicetto]

commit:     b9e8ca9b4aa18689ef7fa7ec46e4bbb7e311eced
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 18:09:14 2017 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 18:09:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e8ca9b

Make sure we rebuild actual libc and not the virtual package.
Thanks to Zac (zmedico) for the pointer.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

 scripts/bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 3a8959ec1a2..f79232627a2 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -272,7 +272,7 @@ for atom in portage.settings.packages:
 [[ -z ${myBINUTILS}   ]] && myBINUTILS="binutils"
 [[ -z ${myGCC}        ]] && myGCC="gcc"
 [[ -z ${myGETTEXT}    ]] && myGETTEXT="gettext"
-[[ -z ${myLIBC}       ]] && myLIBC="virtual/libc"
+[[ -z ${myLIBC}       ]] && myLIBC="$(portageq expand_virtual / virtual/libc)"
 [[ -z ${myTEXINFO}    ]] && myTEXINFO="sys-apps/texinfo"
 [[ -z ${myZLIB}       ]] && myZLIB="zlib"
 [[ -z ${myNCURSES}    ]] && myNCURSES="ncurses"

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Jorge Manuel B. S. Vicetto]

commit:     63d3ee5623950cc04e4b7d5c0eebf4e7a50aeb85
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 18:11:26 2017 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 18:11:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d3ee56

Whitespace.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

 scripts/bootstrap.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index f79232627a2..3fd1c5a0409 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -188,7 +188,7 @@ export ORIGUSE=$(portageq envvar USE)
 
 # Check for 'build' or 'bootstrap' in USE ...
 INVALID_USE=$(gawk -v ORIGUSE="${ORIGUSE}" '
-	BEGIN { 
+	BEGIN {
 		if (ORIGUSE ~ /[[:space:]](build|bootstrap)[[:space:]]/)
 			print "yes"
 	}')
@@ -326,7 +326,7 @@ export USE="-* bootstrap ${ALLOWED_USE} ${BOOTSTRAP_USE}"
 
 # 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
-# before fully bootstrapping. 
+# before fully bootstrapping.
 if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then
 	show_status 3 Emerging packages
 	if [[ ${RESUME} -eq 1 ]] ; then

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Zac Medico]

commit:     6cfec967ac5ad3894f6ce0e6c7289406bd10d480
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 19 04:26:54 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jan 19 04:38:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cfec967

scripts/bootstrap.sh: fix emerge --resume args

Since the emerge argument parser change from bug 673400, positional
arguments must come after all optional arguments.

Reviewed-by: Michael Everitt <m.j.everitt <AT> iee.org>
Bug: https://bugs.gentoo.org/673400
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 scripts/bootstrap.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 3fd1c5a0409..d375542f899 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -330,14 +330,15 @@ export USE="-* bootstrap ${ALLOWED_USE} ${BOOTSTRAP_USE}"
 if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then
 	show_status 3 Emerging packages
 	if [[ ${RESUME} -eq 1 ]] ; then
+		STRAP_EMERGE_POSARGS=""
 		STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --resume"
 		cp /var/run/bootstrap-mtimedb /var/cache/edb
 	else
-		STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} \
+		STRAP_EMERGE_POSARGS="\
 			${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \
 			${myGCC} ${myLIBC} ${myBASELAYOUT} ${myZLIB}"
 	fi
-	${V_ECHO} emerge ${STRAP_EMERGE_OPTS} || cleanup 1
+	${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${STRAP_EMERGE_POSARGS} || cleanup 1
 	echo -------------------------------------------------------------------------------
 	set_bootstrap_stage 3
 fi

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Zac Medico]

commit:     253885e5be3fc395bc746c21962da0aa8b3e32f2
Author:     Michael Everitt <m.j.everitt <AT> iee <DOT> org>
AuthorDate: Sun Jan 19 05:05:56 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jan 19 05:08:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=253885e5

scripts/bootstrap.sh: tidyups

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 scripts/bootstrap.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index d375542f899..03ba014b637 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # people who were here:
@@ -67,9 +67,10 @@ usage() {
 	echo -e "  ${GOOD}--fetchonly (-f)${NORMAL} Just download all the source files"
 	echo -e "  ${GOOD}--info (-i)${NORMAL}      Show system related information"
 	echo -e "  ${GOOD}--pretend (-p)${NORMAL}   Display the packages that will be merged"
-	echo -e "  ${GOOD}--quiet (-q)${NORMAL}     Reduced or condensed output from portage's displays."
+	echo -e "  ${GOOD}--quiet (-q)${NORMAL}     Reduced or condensed output from portage"
 	echo -e "  ${GOOD}--tree (-t)${NORMAL}      Display the dependency tree, forces -p"
 	echo -e "  ${GOOD}--resume (-r)${NORMAL}    Build/use binary packages"
+	echo -e "  ${GOOD}--verbose (-v)${NORMAL}   Verbose output from portage"
 }
 
 STRAP_EMERGE_OPTS="--oneshot"
@@ -92,7 +93,7 @@ for opt in "$@" ; do
 		--quiet|-q)   STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -q"     ; unset STRAP_RUN ;;
 		--tree|-t)    STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -p -t"  ; unset STRAP_RUN ;;
 		--resume|-r)  STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --usepkg --buildpkg";;
-		--verbose|-v) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -v"; V_ECHO=v_echo;;
+		--verbose|-v) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -v"     ; V_ECHO=v_echo;;
 		--version|-V)
 			einfo "Gentoo Linux bootstrap ${cvsver}"
 			exit 0
@@ -348,7 +349,7 @@ 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 ...
-		emerge --prune sys-devel/gcc || cleanup 1
+		${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
@@ -358,7 +359,7 @@ if [[ -n ${STRAP_RUN} ]] ; then
 	echo -------------------------------------------------------------------------------
 	einfo "Please note that you should now add the '-e' option for emerge system:"
 	echo
-	einfo "  # emerge -e system"
+	einfo "  # emerge <other_opts> -e @system"
 	echo
 fi
 

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Matt Turner]

commit:     f3f818eb40d144d40e2496cc87eceea79db380f8
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 17:20:24 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 17:44:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f818eb

scripts/bootstrap.sh: Expand virtual/os-headers fallback

Unlikely that this fallback will ever be hit, but might as well prepare.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 scripts/bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index bfe81ac51dd..e0dae52f02d 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -292,7 +292,7 @@ if [[ ${USE_NPTL} = "1" ]] ; then
 	# Should we build with nptl only?
 	[[ ${USE_NPTLONLY} = "1" ]] && ALLOWED_USE="${ALLOWED_USE} nptlonly"
 fi
-[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="virtual/os-headers"
+[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="$(portageq expand_virtual / virtual/os-headers)"
 
 einfo "Using baselayout : ${myBASELAYOUT}"
 einfo "Using portage    : ${myPORTAGE}"

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Matt Turner]

commit:     b73bd14850491738363f3c8e60519b22d6ece063
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 07:03:02 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 17:44:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b73bd148

scripts/bootstrap.sh: Emerge the actual libc

The python program creates a set of bash variable assignments like

myGCC="sys-devel/gcc";

which are used to make a list of packages to be rebuilt during
catalyst's stage 2. The toolchain, including libc, is supposed to be
rebuilt in this stage, but 'portage.settings.packages' contains
'virtual/libc' and not a provider, so it generates:

myLIBC="virtual/libc";

This results in catalyst not rebuilding the libc itself but instead
reemerging virtual/libc.

Commit b9e8ca9b4aa1 (Make sure we rebuild actual libc and not the
virtual package.) tried to fix this, but obviously missed the mark as
any testing would have shown.

The solution is to have the python program expand the virtual itself.

Fixes: b9e8ca9b4aa1 (Make sure we rebuild actual libc and not the virtual package.)
Closes: https://bugs.gentoo.org/511694
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 scripts/bootstrap.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 03ba014b637..bfe81ac51dd 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -259,11 +259,14 @@ done
 
 eval $(pycmd '
 import portage
+from portage.dbapi._expand_new_virt import expand_new_virt
 import sys
+root = portage.settings["EROOT"]
 for atom in portage.settings.packages:
 	if not isinstance(atom, portage.dep.Atom):
 		atom = portage.dep.Atom(atom.lstrip("*"))
 	varname = "my" + portage.catsplit(atom.cp)[1].upper().replace("-", "_")
+	atom = list(expand_new_virt(portage.db[root]["vartree"].dbapi, atom))[0]
 	sys.stdout.write("%s=\"%s\"; " % (varname, atom))
 ')
 

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Matt Turner]

commit:     b86df0838044e4233785abdd499ba194eb4ecdd6
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 17:23:15 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 17:44:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86df083

scripts/bootstrap.sh: Use full cat/pkg names

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 scripts/bootstrap.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index e0dae52f02d..0a4bc06c3c8 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -272,14 +272,14 @@ for atom in portage.settings.packages:
 
 # This stuff should never fail but will if not enough is installed.
 [[ -z ${myBASELAYOUT} ]] && myBASELAYOUT=">=$(portageq best_version / sys-apps/baselayout)"
-[[ -z ${myPORTAGE}    ]] && myPORTAGE="portage"
-[[ -z ${myBINUTILS}   ]] && myBINUTILS="binutils"
-[[ -z ${myGCC}        ]] && myGCC="gcc"
-[[ -z ${myGETTEXT}    ]] && myGETTEXT="gettext"
+[[ -z ${myPORTAGE}    ]] && myPORTAGE="sys-apps/portage"
+[[ -z ${myBINUTILS}   ]] && myBINUTILS="sys-devel/binutils"
+[[ -z ${myGCC}        ]] && myGCC="sys-devel/gcc"
+[[ -z ${myGETTEXT}    ]] && myGETTEXT="sys-devel/gettext"
 [[ -z ${myLIBC}       ]] && myLIBC="$(portageq expand_virtual / virtual/libc)"
 [[ -z ${myTEXINFO}    ]] && myTEXINFO="sys-apps/texinfo"
-[[ -z ${myZLIB}       ]] && myZLIB="zlib"
-[[ -z ${myNCURSES}    ]] && myNCURSES="ncurses"
+[[ -z ${myZLIB}       ]] && myZLIB="sys-libs/zlib"
+[[ -z ${myNCURSES}    ]] && myNCURSES="sys-libs/ncurses"
 
 # Do we really want gettext/nls?
 [[ ${USE_NLS} != 1 ]] && myGETTEXT=

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Matt Turner]

commit:     772775deadb874bde912cfaa7e1252f40631f741
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 17:26:26 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 17:44:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=772775de

scripts/bootstrap.sh: Remove nptlonly cruft

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 scripts/bootstrap.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 0a4bc06c3c8..aa31fb15e8b 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -239,9 +239,6 @@ for opt in ${ORIGUSE} ; do
 			fi
 			USE_NPTL=1
 			;;
-		nptlonly)
-			USE_NPTLONLY=1
-			;;
 		multilib)
 			ALLOWED_USE="${ALLOWED_USE} multilib"
 			;;
@@ -284,13 +281,10 @@ for atom in portage.settings.packages:
 # Do we really want gettext/nls?
 [[ ${USE_NLS} != 1 ]] && myGETTEXT=
 
-# Do we really have no 2.4.x nptl kernels in portage?
 if [[ ${USE_NPTL} = "1" ]] ; then
 	myOS_HEADERS="$(portageq best_visible / '>=sys-kernel/linux-headers-2.6.0')"
 	[[ -n ${myOS_HEADERS} ]] && myOS_HEADERS=">=${myOS_HEADERS}"
 	ALLOWED_USE="${ALLOWED_USE} nptl"
-	# Should we build with nptl only?
-	[[ ${USE_NPTLONLY} = "1" ]] && ALLOWED_USE="${ALLOWED_USE} nptlonly"
 fi
 [[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="$(portageq expand_virtual / virtual/os-headers)"
 

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Matt Turner]

commit:     0aa49828ae253a22a3327f4024fcada801e64245
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 01:15:25 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 01:37:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa49828

scripts/bootstrap.sh: Allow CONFIG_PROTECT

With a CONFIG_PROTECT="-*" setting, glibc will overwrite the system's
/etc/locale.gen file in src_install() with its default-empty one. In
pkg_postinst() it reads the empty /etc/locale.gen it just installed, and
as a result generates all locales.

So, allow CONFIG_PROTECT to be passed through unmolested so long as it
starts with "-*". This allows locales to be selectively enabled when
bootstrap.sh is run with CONFIG_PROTECT="-* /etc/locale.gen".

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 scripts/bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index aa31fb15e8b..c06e25dba13 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -306,7 +306,7 @@ echo ---------------------------------------------------------------------------
 [[ -x /usr/bin/gcc-config  ]] && GCC_CONFIG="/usr/bin/gcc-config"
 
 # Allow portage to overwrite stuff
-export CONFIG_PROTECT="-*"
+[[ $CONFIG_PROTECT != "-*"* ]] && export CONFIG_PROTECT="-*"
 
 # disable collision-protection
 export FEATURES="${FEATURES} -collision-protect"

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Ulrich Müller]

commit:     b95aa174ca6822b3c63d327938b32a3d637fae5a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  7 13:13:00 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jun  7 13:14:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b95aa174

scripts/bootstrap.sh: Fix copyright years in output.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 scripts/bootstrap.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index c06e25dba13..46026a79e1c 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -58,8 +58,7 @@ v_echo() {
 cvsver="$Id$" # TODO: FIXME for Git era
 cvsver=${cvsver##*,v }
 cvsver=${cvsver%%Exp*}
-cvsyear=${cvsver#* }
-cvsyear=${cvsyear%%/*}
+file_copyright=$(sed -n '/Copyright/!b;s/^# *//;p;q' $0)
 
 usage() {
 	echo -e "Usage: ${HILITE}${0##*/}${NORMAL} ${GOOD}[options]${NORMAL}"
@@ -138,7 +137,7 @@ if [[ ! -d ${MYPROFILEDIR} ]] ; then
 fi
 
 echo -e "\n${GOOD}Gentoo Linux; ${BRACKET}http://www.gentoo.org/${NORMAL}"
-echo -e "Copyright 1999-${cvsyear} Gentoo Foundation; Distributed under the GPLv2"
+echo -e "${file_copyright}; Distributed under the GPLv2"
 if [[ " ${STRAP_EMERGE_OPTS} " == *" -f "* ]] ; then
 	echo "Fetching all bootstrap-related archives ..."
 elif [[ -n ${STRAP_RUN} ]] ; then

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Ulrich Müller]

commit:     19400683f19863f94f23592c081767797274d09b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  2 10:55:45 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Sep  2 10:58:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19400683

scripts/bootstrap.sh: Fix version

There is no CVS $Id$ any more.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 scripts/bootstrap.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 46026a79e1c..a84263ba448 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+file_version="2021.0"		# update manually: <year>.<counter>
+
 # people who were here:
 # (drobbins, 06 Jun 2003)
 # (solar, Jul 2004)
@@ -55,9 +57,6 @@ v_echo() {
 	env "$@"
 }
 
-cvsver="$Id$" # TODO: FIXME for Git era
-cvsver=${cvsver##*,v }
-cvsver=${cvsver%%Exp*}
 file_copyright=$(sed -n '/Copyright/!b;s/^# *//;p;q' $0)
 
 usage() {
@@ -94,7 +93,7 @@ for opt in "$@" ; do
 		--resume|-r)  STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --usepkg --buildpkg";;
 		--verbose|-v) STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -v"     ; V_ECHO=v_echo;;
 		--version|-V)
-			einfo "Gentoo Linux bootstrap ${cvsver}"
+			einfo "Gentoo Linux bootstrap ${file_version}"
 			exit 0
 			;;
 		*)

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Mike Gilbert]

commit:     9f4d46a13ed4b223866c50e109f5c51488fc6bd9
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 21:09:24 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 21:09:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4d46a1

scripts/bootstrap.sh: do not attempt to trap SIGKILL

Closes: https://bugs.gentoo.org/839162
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 scripts/bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index a84263ba448e..0c0d6062a789 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -172,7 +172,7 @@ pycmd() {
 }
 
 # TSTP messes ^Z of bootstrap up, so we don't trap it anymore.
-trap "cleanup" TERM KILL INT QUIT ABRT
+trap "cleanup" TERM INT QUIT ABRT
 
 # Bug #50158 (don't use `which` in a bootstrap).
 if ! type -path portageq &>/dev/null ; then

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Mike Gilbert]

commit:     c26dfbbcfeb7239fbb527b0fceab36c7371f4b9d
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 21:16:35 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 21:16:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c26dfbbc

scripts/bootstrap.sh: maintainer = releng

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 scripts/bootstrap.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 0c0d6062a789..4e6b87af15a4 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -2,6 +2,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Maintainer: releng@gentoo.org
+
 file_version="2021.0"		# update manually: <year>.<counter>
 
 # people who were here:

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Sam James]

commit:     991727070a928a03481303ed5b0a571534853445
Author:     Krzesimir Nowak <knowak <AT> microsoft <DOT> com>
AuthorDate: Wed Feb 15 10:14:30 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 16:17:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99172707

scripts/bootstrap.sh: Fix bootstrap in verbose mode

Verbose mode does not unset STRAP_RUN, thus the script tries to prune
sys-devel/gcc at the later stage. Currently portage exits with an exit
status 1 if a specific package was requested to be pruned and there
was nothing to do. This results in a bootstrap failure. So before we
try to prune, let's do a dry run to see if anything would be done.

For the portage code that results in exit status 1, see the following
link:

https://gitweb.gentoo.org/proj/portage.git/tree/lib/_emerge/actions.py?id=bde2a895cf520687dce7a8e92601041a37529ba0#n1700

Signed-off-by: Krzesimir Nowak <knowak <AT> microsoft.com>
Closes: https://github.com/gentoo/gentoo/pull/29612
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 4e6b87af15a4..1e998075691a 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -345,10 +345,16 @@ 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
+		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
 

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Joshua Kinard]

commit:     67495c6078f95162d424d1c0942ad55c33a02149
Author:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  2 03:18:37 2023 +0000
Commit:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
CommitDate: Mon Oct  2 03:18:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67495c60

scripts/bootstrap.sh: Don't bail if 'emerge --prune' returns 1

If 'emerge --prune' doesn't find any older gcc's to prune, it
will return '1', which causes bootstrap.sh to run the cleanup
method, and this results in catalyst aborting at the end of a
stage2 build.  Removing the all to cleanup prevents this.
Issue was added due to resolution of Bug #851750.

Closes: https://bugs.gentoo.org/881839
Signed-off-by: Joshua Kinard <kumba <AT> gentoo.org>

 scripts/bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 1e998075691a..48ed539e8186 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -351,7 +351,7 @@ if [[ -n ${STRAP_RUN} ]] ; then
 		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
+			${V_ECHO} emerge ${STRAP_EMERGE_OPTS} --prune sys-devel/gcc
 			# Make sure the profile and /lib/cpp and /usr/bin/cc are valid ...
 			${GCC_CONFIG} "$(${GCC_CONFIG} --get-current-profile)" &>/dev/null
 		fi

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Sam James]

commit:     5c363d614a34eea87a18d710d9f6f1b38650ba93
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 11:05:44 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 11:07:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c363d61

scripts: drop USE=userlocales

commit 486575836bbd74bc6f35d06d31ddd45b108e5f2d
Author: Christian Heim <phreak <AT> gentoo.org>
Date:   Sat Jan 20 14:21:41 2007 +0000

    USE="userlocales" got deprecated with the introduction of /etc/locale.gen into sys-libs/glibc.

commit 75120cd1a2491a7ea11f2657a11fc9267c111af0
Author: Mike Frysinger <vapier <AT> gentoo.org>
Date:   Mon Apr 17 16:52:57 2006 +0000

    Kill USE=userlocales and replace with Debian locale-gen #22565.
    (Portage version: 2.1_pre9)
     (Signed Manifest commit)

Bug: https://bugs.gentoo.org/22565
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 7244fcbb49a2..caea6f597217 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -230,9 +230,6 @@ for opt in ${ORIGUSE} ; do
 		multilib)
 			ALLOWED_USE="${ALLOWED_USE} multilib"
 			;;
-		userlocales)
-			ALLOWED_USE="${ALLOWED_USE} userlocales"
-			;;
 	esac
 done
 

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Sam James]

commit:     36966e750b33b9ca7c664ce7f1710072561ae7c1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 11:04:03 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 11:07:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36966e75

scripts: cleanup USE=nptl

Bug: https://bugs.gentoo.org/820905
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap.sh | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 48ed539e8186..7244fcbb49a2 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Maintainer: releng@gentoo.org
 
-file_version="2021.0"		# update manually: <year>.<counter>
+file_version="2024.0"		# update manually: <year>.<counter>
 
 # people who were here:
 # (drobbins, 06 Jun 2003)
@@ -227,18 +227,6 @@ for opt in ${ORIGUSE} ; do
 			USE_NLS=1
 			ALLOWED_USE="${ALLOWED_USE} nls"
 			;;
-		nptl)
-			export MYARCH=$(portageq envvar ARCH)
- 			if [[ -z $(portageq best_visible / '>=sys-kernel/linux-headers-2.6.0') ]] ; then
-				eerror "You need to have >=sys-kernel/linux-headers-2.6.0 unmasked!"
-				eerror "Please edit the latest >=sys-kernel/linux-headers-2.6.0 package,"
-				eerror "and add your ARCH to KEYWORDS or change your make.profile link"
-				eerror "to a profile which does not have 2.6 headers masked."
-				echo
-				cleanup 1
-			fi
-			USE_NPTL=1
-			;;
 		multilib)
 			ALLOWED_USE="${ALLOWED_USE} multilib"
 			;;
@@ -277,17 +265,11 @@ for atom in portage.settings.packages:
 [[ -z ${myTEXINFO}    ]] && myTEXINFO="sys-apps/texinfo"
 [[ -z ${myZLIB}       ]] && myZLIB="sys-libs/zlib"
 [[ -z ${myNCURSES}    ]] && myNCURSES="sys-libs/ncurses"
+[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="$(portageq expand_virtual / virtual/os-headers)"
 
 # Do we really want gettext/nls?
 [[ ${USE_NLS} != 1 ]] && myGETTEXT=
 
-if [[ ${USE_NPTL} = "1" ]] ; then
-	myOS_HEADERS="$(portageq best_visible / '>=sys-kernel/linux-headers-2.6.0')"
-	[[ -n ${myOS_HEADERS} ]] && myOS_HEADERS=">=${myOS_HEADERS}"
-	ALLOWED_USE="${ALLOWED_USE} nptl"
-fi
-[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="$(portageq expand_virtual / virtual/os-headers)"
-
 einfo "Using baselayout : ${myBASELAYOUT}"
 einfo "Using portage    : ${myPORTAGE}"
 einfo "Using os-headers : ${myOS_HEADERS}"
@@ -322,9 +304,6 @@ if [ ${BOOTSTRAP_STAGE} -le 1 ] ; then
 fi
 export USE="-* bootstrap ${ALLOWED_USE} ${BOOTSTRAP_USE}"
 
-# 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
-# before fully bootstrapping.
 if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then
 	show_status 3 Emerging packages
 	if [[ ${RESUME} -eq 1 ]] ; then

[gentoo-commits] repo/gentoo:master commit in: scripts/

[Sam James]

commit:     5d8794d14ddd53713c77b7f0400aa206a6ab14be
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 11:06:29 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 11:07:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8794d1

scripts: use HTTPS

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index caea6f597217..61bbb0ab9a0f 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -137,7 +137,7 @@ if [[ ! -d ${MYPROFILEDIR} ]] ; then
 	exit 1
 fi
 
-echo -e "\n${GOOD}Gentoo Linux; ${BRACKET}http://www.gentoo.org/${NORMAL}"
+echo -e "\n${GOOD}Gentoo Linux; ${BRACKET}https://www.gentoo.org/${NORMAL}"
 echo -e "${file_copyright}; Distributed under the GPLv2"
 if [[ " ${STRAP_EMERGE_OPTS} " == *" -f "* ]] ; then
 	echo "Fetching all bootstrap-related archives ..."