[gentoo-commits] gentoo-alt r1695 - trunk/baselayout-prefix

[Fabian Groffen (grobian)]

Author: grobian
Date: 2011-03-31 17:24:48 +0000 (Thu, 31 Mar 2011)
New Revision: 1695

Added:
   trunk/baselayout-prefix/baselayout-1.12.5-prefix-chaining.patch
Log:
add aggregated (patchqueue) prefix-chaining patch

Added: trunk/baselayout-prefix/baselayout-1.12.5-prefix-chaining.patch
===================================================================
--- trunk/baselayout-prefix/baselayout-1.12.5-prefix-chaining.patch	                        (rev 0)
+++ trunk/baselayout-prefix/baselayout-1.12.5-prefix-chaining.patch	2011-03-31 17:24:48 UTC (rev 1695)
@@ -0,0 +1,190 @@
+# HG changeset patch
+# User Markus Duft <mduft@g.o>
+# Date 1301591825 -7200
+# Node ID 95bbe3bfa150477a4b13894b675d836b20f9cde8
+# Parent  1df7e0823f1283d1fc9a71e10a89ff2757092dbc
+imported patch baselayout-1.12.5-prefix-chaining.patch
+
+diff -r 1df7e0823f12 -r 95bbe3bfa150 baselayout-prefix/etc/profile
+--- a/baselayout-prefix/etc/profile	Thu Mar 31 16:49:00 2011 +0000
++++ b/baselayout-prefix/etc/profile	Thu Mar 31 19:17:05 2011 +0200
+@@ -4,6 +4,62 @@
+ # environment for login shells.
+ #
+ 
++#
++# for prefix-chaining, the very first thing to do is to load
++# the profiles for all chained instances above.
++#
++# TODO: is it safe in any case to shell source make.conf?
++# don't do any recursive expansion here. if the parent can
++# use READONLY_EPREFIX's, it has to have the same profile as
++# we have here, and thus it will source parents before
++# evaluating anything from itself.
++#
++_ro_root=$(. "@GENTOO_PORTAGE_EPREFIX@"/etc/make.conf && echo $READONLY_EPREFIX)
++_ro_deps=${_ro_root#*:}
++_ro_root=${_ro_root%:*}
++
++#
++# prevent dooming of _ro_* variables by recursing down the
++# profile chain, by backing the up, tagged by resursion depth.
++#
++
++[[ -z "${_ro_recursion_level}" ]] && _ro_recursion_level=0
++((++_ro_recursion_level))
++
++for _ro_backup_var in _ro_root _ro_deps; do
++	eval "_ro_b${_ro_recursion_level}_${_ro_backup_var}=\${${_ro_backup_var}}"
++done
++
++if [ -n "${_ro_root}" -a -f "${_ro_root}"/etc/profile ]; then
++	. "${_ro_root}"/etc/profile
++fi
++
++for _ro_backup_var in _ro_root _ro_deps; do
++	eval "${_ro_backup_var}=\${_ro_b${_ro_recursion_level}_${_ro_backup_var}}"
++done
++
++((--_ro_recursion_level))
++
++#
++# With prefix-chaining we want another set of variables that
++# should be retained for all prefixes. for example it is ok
++# to retain PKG_CONFIG_PATH if the parent of the chain can
++# be used to resolve RDEPEND...
++#
++if [[ -n "${_ro_root}" ]]; then
++	_ro_chained_path_vars="PATH MANPATH"
++
++	if [[ ${_ro_deps} == *RDEPEND* ]]; then
++		_ro_chained_path_vars="${_ro_chained_path_vars} PKG_CONFIG_PATH"
++	else
++		unset PKG_CONFIG_PATH
++	fi
++
++	for var in ${_ro_chained_path_vars}; do
++		eval "_ro_backupenv_paths_${var}=\${${var}}"
++	done
++fi
++
+ # Load environment settings from profile.env, which is created by
+ # env-update from the files in /etc/env.d
+ if [ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env ] ; then
+@@ -21,10 +77,17 @@
+ # It is intentional in the following line to use || instead of -o.
+ # This way the evaluation can be short-circuited and calling whoami is
+ # avoided.
++#
++# system directories are only appended if this prefix is the last
++# one in a chain of prefixes (or the only prefix in the chain), so
++# that they don't end up in the middle of multiple different prefix
++# paths (profile is recursive now, see above!)
+ if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
+-	PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}:/usr/sbin:/usr/bin:/sbin:/bin"
++	PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}"
++	[[ -z "${_ro_root}" ]] && PATH="$PATH:/usr/sbin:/usr/bin:/sbin:/bin"
+ else
+-	PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}:/usr/bin:/bin"
++	PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}"
++	[[ -z "${_ro_root}" ]] && PATH="$PATH:/usr/bin:/bin"
+ fi
+ export PATH
+ unset ROOTPATH
+@@ -47,9 +110,34 @@
+ 		# it in the user's dot-files), but it shouldn't make any 
+ 		# difference.
+ 		. "@GENTOO_PORTAGE_EPREFIX@"/etc/bash/bashrc
++	elif [ -n "${_ro_root}" ]; then
++		# We're in a prefix chain, but have no local bash. we rely on bash
++		# beeing there _somewhere_ in the chain, so we do not need to set
++		# PS1 explicitly.
++		if [ -z "${PS1}" ]; then
++			# try harder to find something in the parent prefix of the chain.
++			# dont bother to search multiple chain members up to the top.
++			if [ -f "${_ro_root}/etc/bash/bashrc" ]; then
++				. "${_ro_root}/etc/bash/bashrc"
++			fi
++		fi
+ 	else
+ 		PS1='\u@\h \w \$ '
+ 	fi
++
++	# Set the last dirpart of the current prefix somewhere
++	# in the prompt, so one immediately knows where he/she is.
++	if [ ${_ro_recursion_level} == 0 ]; then
++		# we're in the last prefix of the chain here.
++		_ro_name="@GENTOO_PORTAGE_EPREFIX@"
++		_ro_name="${_ro_name##*/}"
++
++		# use color only if the prompt already contains color escapes
++		case "${PS1}" in
++		*'\[\033['*'m\]'*) 	PS1="\[\033[01;36m\][${_ro_name}]\[\033[00m\] ${PS1}" ;;
++		*) 					PS1="[${_ro_name}] ${PS1}" ;;
++		esac
++	fi
+ else
+ 	# Setup a bland default prompt.  Since this prompt should be useable
+ 	# on color and non-color terminals, as well as shells that don't
+@@ -57,9 +145,43 @@
+ 	PS1="`whoami`@`uname -n | cut -f1 -d.` \$ "
+ fi
+ 
++# when chaining prefixes, we want the prompt to be passed to the child too,
++# so we need to export it.
++export PS1
++
+ for sh in "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.d/*.sh ; do
+ 	if [ -r "$sh" ] ; then
+ 		. "$sh"
+ 	fi
+ done
+ unset sh
++
++#
++# finally chain the save variables for previous prefixes in the chain.
++#
++if [[ -n "${_ro_chained_path_vars}" ]]; then
++	for var in ${_ro_chained_path_vars}; do
++		eval "export ${var}=\${${var}}:\${_ro_backupenv_paths_${var}}"
++		eval "unset _ro_backupenv_paths_${var}"
++	done
++fi
++
++#
++# final finally set EPREFIX to our prefix if we don't have a local portage. this
++# was previously done by the startprefix script, but we want to be able to start
++# this environment by simply sourcing etc/profile with the correct shell.
++#
++if [[ -z "${EPREFIX}" ]]; then
++	if [[ ! -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/emerge ]]; then
++		export EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
++	fi
++elif [[ "${EPREFIX}" != "@GENTOO_PORTAGE_EPREFIX@" && ${_ro_recursion_level} == 0 ]]; then
++	echo "WARNING: EPREFIX is set from environment to \"${EPREFIX}\"."
++	echo "         You are entering the prefix \"@GENTOO_PORTAGE_EPREFIX@\"."
++	echo "         Having EPREFIX set this way will probably render this environment unusable."
++fi
++
++unset _ro_root
++unset _ro_deps
++unset _ro_chained_path_vars
++
+diff -r 1df7e0823f12 -r 95bbe3bfa150 baselayout-prefix/sbin/env-update.sh
+--- a/baselayout-prefix/sbin/env-update.sh	Thu Mar 31 16:49:00 2011 +0000
++++ b/baselayout-prefix/sbin/env-update.sh	Thu Mar 31 19:17:05 2011 +0200
+@@ -1,4 +1,4 @@
+-#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
++#! /usr/bin/env bash
+ # Copyright 1999-2004 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+ 
+diff -r 1df7e0823f12 -r 95bbe3bfa150 baselayout-prefix/sbin/runscript.sh
+--- a/baselayout-prefix/sbin/runscript.sh	Thu Mar 31 16:49:00 2011 +0000
++++ b/baselayout-prefix/sbin/runscript.sh	Thu Mar 31 19:17:05 2011 +0200
+@@ -1,4 +1,4 @@
+-#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
++#! /usr/bin/env bash
+ # Copyright 1999-2006 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+