Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 904242 | Differences between
and this patch

Collapse All | Expand All

(-)a/scripts/bootstrap-prefix.sh (-9 / +35 lines)
Lines 2945-2951 EOF Link Here
2945
	done
2945
	done
2946
	export PATH="$EPREFIX/usr/bin:$EPREFIX/bin:$EPREFIX/tmp/usr/bin:$EPREFIX/tmp/bin:$EPREFIX/tmp/usr/local/bin:${PATH}"
2946
	export PATH="$EPREFIX/usr/bin:$EPREFIX/bin:$EPREFIX/tmp/usr/bin:$EPREFIX/tmp/bin:$EPREFIX/tmp/usr/local/bin:${PATH}"
2947
2947
2948
	cat << EOF
2948
	if [[ -z ${PARTIAL_BOOTSTRAP} ]]; then
2949
		cat << EOF
2949
2950
2950
OK!  I'm going to give it a try, this is what I have collected sofar:
2951
OK!  I'm going to give it a try, this is what I have collected sofar:
2951
  EPREFIX=${EPREFIX}
2952
  EPREFIX=${EPREFIX}
Lines 2959-2972 Prefix. In short, I'm going to run stage1, stage2, stage3, followed by Link Here
2959
emerge -e system.  If any of these stages fail, both you and me are in
2960
emerge -e system.  If any of these stages fail, both you and me are in
2960
deep trouble.  So let's hope that doesn't happen.
2961
deep trouble.  So let's hope that doesn't happen.
2961
EOF
2962
EOF
2962
	echo
2963
		echo
2963
	[[ ${TODO} == 'noninteractive' ]] && ans="" ||
2964
		[[ ${TODO} == 'noninteractive' ]] && ans="" ||
2964
	read -p "Type here what you want to wish me [luck] " ans
2965
		read -p "Type here what you want to wish me [luck] " ans
2965
	if [[ -n ${ans} && ${ans} != "luck" ]] ; then
2966
		if [[ -n ${ans} && ${ans} != "luck" ]] ; then
2966
		echo "Huh?  You're not serious, are you?"
2967
			echo "Huh?  You're not serious, are you?"
2967
		sleep 3
2968
			sleep 3
2968
	fi
2969
		fi
2969
	echo
2970
		echo
2971
  fi
2970
2972
2971
	if [[ -d ${HOST_GENTOO_EROOT} ]]; then
2973
	if [[ -d ${HOST_GENTOO_EROOT} ]]; then
2972
		if ! [[ -x ${EPREFIX}/tmp/usr/lib/portage/bin/emerge ]] && ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage_host_gentoo ; then
2974
		if ! [[ -x ${EPREFIX}/tmp/usr/lib/portage/bin/emerge ]] && ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage_host_gentoo ; then
Lines 2990-2995 EOF Link Here
2990
	ROOT="${EPREFIX}"
2992
	ROOT="${EPREFIX}"
2991
	set_helper_vars
2993
	set_helper_vars
2992
2994
2995
	if [[ -n ${PARTIAL_BOOTSTRAP} ]]; then
2996
	cat << EOF
2997
2998
OK! All necessary tools and ENV variables were installed:
2999
  EPREFIX=${EPREFIX}
3000
  CHOST=${CHOST}
3001
  PATH=${PATH}
3002
  MAKEOPTS=${MAKEOPTS}
3003
Now I'm going to  run an <action> you asked me to.
3004
EOF
3005
		return 0;
3006
	fi
3007
2993
	if ! [[ -e ${EPREFIX}/.stage1-finished ]] && ! bootstrap_stage1_log ; then
3008
	if ! [[ -e ${EPREFIX}/.stage1-finished ]] && ! bootstrap_stage1_log ; then
2994
		# stage 1 fail
3009
		# stage 1 fail
2995
		cat << EOF
3010
		cat << EOF
Lines 3367-3372 if [[ -n ${PKG_CONFIG_PATH} ]] ; then Link Here
3367
fi
3382
fi
3368
3383
3369
einfo "ready to bootstrap ${TODO}"
3384
einfo "ready to bootstrap ${TODO}"
3385
3386
# part of bootstrap_interactive should be executed before any bootstrap_${TODO}
3387
# to properly setup environment variables and guarantee that bootstrap_${TODO}
3388
# executes inside a prefix
3389
if [[ ${TODO} != "noninteractive" && $(type -t bootstrap_${TODO} == "function") ]]; then
3390
	PARTIAL_BOOTSTRAP=true
3391
	TODO='noninteractive' bootstrap_interactive || exit 1
3392
	bootstrap_${TODO} || exit 1
3393
	exit 0
3394
fi
3395
3370
# bootstrap_interactive proceeds with guessed defaults when TODO=noninteractive
3396
# bootstrap_interactive proceeds with guessed defaults when TODO=noninteractive
3371
bootstrap_${TODO#non} || exit 1
3397
bootstrap_${TODO#non} || exit 1
3372
3398

Return to bug 904242