From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-382041-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1R3Xzx-0004ES-RL
for garchives@archives.gentoo.org; Tue, 13 Sep 2011 18:46:22 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BF15B21C2C6;
Tue, 13 Sep 2011 18:45:58 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 6D1A121C2C6
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Sep 2011 18:45:58 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A9DAA1B401A
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Sep 2011 18:45:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 0E31480042
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Sep 2011 18:45:57 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <9727a7d287d8c0e27bccaa6e04f7f70155e31b30.grobian@gentoo>
Subject: [gentoo-commits] proj/portage:prefix commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/bashrc-functions.sh bin/phase-functions.sh bin/phase-helpers.sh bin/save-ebuild-env.sh
X-VCS-Directories: bin/
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: 9727a7d287d8c0e27bccaa6e04f7f70155e31b30
Date: Tue, 13 Sep 2011 18:45:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: f9efcd5ce17d8525e894c3db47fd3143
commit: 9727a7d287d8c0e27bccaa6e04f7f70155e31b30
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 18:45:45 2011 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 18:45:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D9727a7d2
bin/: bring back Prefix changes to new files
---
bin/bashrc-functions.sh | 4 +-
bin/phase-functions.sh | 13 ++++++---
bin/phase-helpers.sh | 70 +++++++++++++++++++++++------------------=
-----
bin/save-ebuild-env.sh | 5 +++-
4 files changed, 50 insertions(+), 42 deletions(-)
diff --git a/bin/bashrc-functions.sh b/bin/bashrc-functions.sh
index 4da5585..8018ae9 100644
--- a/bin/bashrc-functions.sh
+++ b/bin/bashrc-functions.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!@PREFIX_PORTAGE_BASH@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
=20
portageq() {
PYTHONPATH=3D${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
- "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" "$@=
"
+ "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}/porta=
geq" "$@"
}
=20
register_die_hook() {
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 164b309..77bba11 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PREFIX_PORTAGE_BASH@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
=20
@@ -27,7 +27,8 @@ PORTAGE_READONLY_VARS=3D"D EBUILD EBUILD_PHASE \
PORTAGE_SAVED_READONLY_VARS PORTAGE_SIGPIPE_STATUS \
PORTAGE_TMPDIR PORTAGE_UPDATE_ENV PORTAGE_USERNAME \
PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR PORTDIR_OVERLAY \
- PROFILE_PATHS REPLACING_VERSIONS REPLACED_BY_VERSION T WORKDIR"
+ PROFILE_PATHS REPLACING_VERSIONS REPLACED_BY_VERSION T WORKDIR \
+ ED EROOT"
=20
PORTAGE_SAVED_READONLY_VARS=3D"A CATEGORY P PF PN PR PV PVR"
=20
@@ -98,7 +99,9 @@ filter_readonly_variables() {
0|1|2)
;;
*)
- filtered_vars+=3D" ED EPREFIX EROOT"
+ # PREFIX LOCAL: always respect these
+ #filtered_vars+=3D" ED EPREFIX EROOT"
+ # PREFIX LOCAL
;;
esac
=20
@@ -126,7 +129,7 @@ filter_readonly_variables() {
"
fi
=20
- "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-=
environment.py "${filtered_vars}" || die "filter-bash-environment.py fail=
ed"
+ "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}"/filt=
er-bash-environment.py "${filtered_vars}" || die "filter-bash-environment=
.py failed"
}
=20
# @FUNCTION: preprocess_ebuild_env
@@ -550,6 +553,7 @@ dyn_install() {
fi
echo "${USE}" > USE
echo "${EAPI:-0}" > EAPI
+ echo "${EPREFIX}" > EPREFIX
set +f
=20
# local variables can leak into the saved environment.
@@ -632,6 +636,7 @@ dyn_help() {
echo "production (stripped)"
fi
echo " merge to : ${ROOT}"
+ echo " offset : ${EPREFIX}"
echo
if [ -n "$USE" ]; then
echo "Additionally, support for the following optional features will b=
e enabled:"
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index a033fa8..04cc291 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PREFIX_PORTAGE_BASH@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
=20
@@ -19,8 +19,8 @@ into() {
export DESTTREE=3D""
else
export DESTTREE=3D$1
- if [ ! -d "${D}${DESTTREE}" ]; then
- install -d "${D}${DESTTREE}"
+ if [ ! -d "${ED}${DESTTREE}" ]; then
+ install -d "${ED}${DESTTREE}"
local ret=3D$?
if [[ $ret -ne 0 ]] ; then
helpers_die "${FUNCNAME[0]} failed"
@@ -35,8 +35,8 @@ insinto() {
export INSDESTTREE=3D""
else
export INSDESTTREE=3D$1
- if [ ! -d "${D}${INSDESTTREE}" ]; then
- install -d "${D}${INSDESTTREE}"
+ if [ ! -d "${ED}${INSDESTTREE}" ]; then
+ install -d "${ED}${INSDESTTREE}"
local ret=3D$?
if [[ $ret -ne 0 ]] ; then
helpers_die "${FUNCNAME[0]} failed"
@@ -51,8 +51,8 @@ exeinto() {
export _E_EXEDESTTREE_=3D""
else
export _E_EXEDESTTREE_=3D"$1"
- if [ ! -d "${D}${_E_EXEDESTTREE_}" ]; then
- install -d "${D}${_E_EXEDESTTREE_}"
+ if [ ! -d "${ED}${_E_EXEDESTTREE_}" ]; then
+ install -d "${ED}${_E_EXEDESTTREE_}"
local ret=3D$?
if [[ $ret -ne 0 ]] ; then
helpers_die "${FUNCNAME[0]} failed"
@@ -67,8 +67,8 @@ docinto() {
export _E_DOCDESTTREE_=3D""
else
export _E_DOCDESTTREE_=3D"$1"
- if [ ! -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then
- install -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
+ if [ ! -d "${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then
+ install -d "${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
local ret=3D$?
if [[ $ret -ne 0 ]] ; then
helpers_die "${FUNCNAME[0]} failed"
@@ -135,7 +135,7 @@ keepdir() {
local x
if [ "$1" =3D=3D "-R" ] || [ "$1" =3D=3D "-r" ]; then
shift
- find "$@" -type d -printf "${D}%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" \
+ find "$@" -type d -printf "${ED}%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" =
\
| tr "\n" "\0" | \
while read -r -d $'\0' ; do
>> "$REPLY" || \
@@ -143,7 +143,7 @@ keepdir() {
done
else
for x in "$@"; do
- >> "${D}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || \
+ >> "${ED}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || \
die "Failed to create .keep in ${D}${x}"
done
fi
@@ -398,12 +398,12 @@ econf() {
sed -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" -i "$ECONF_SOURCE=
/configure" || \
die "Substition of shebang in '$ECONF_SOURCE/configure' failed"
fi
- if [ -e /usr/share/gnuconfig/ ]; then
+ if [ -e "${EPREFIX}"/usr/share/gnuconfig/ ]; then
find "${WORKDIR}" -type f '(' \
-name config.guess -o -name config.sub ')' -print0 | \
while read -r -d $'\0' x ; do
- vecho " * econf: updating ${x/${WORKDIR}\/} with /usr/share/gnuconfi=
g/${x##*/}"
- cp -f /usr/share/gnuconfig/"${x##*/}" "${x}"
+ vecho " * econf: updating ${x/${WORKDIR}\/} with ${EPREFIX}/usr/shar=
e/gnuconfig/${x##*/}"
+ cp -f "${EPREFIX}"/usr/share/gnuconfig/"${x##*/}" "${x}"
done
fi
=20
@@ -423,7 +423,7 @@ econf() {
if [[ -n ${CONF_LIBDIR} ]] && ! _hasgq --libdir=3D\* "$@" ; then
export CONF_PREFIX=3D$(_hasg --exec-prefix=3D\* "$@")
[[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=3D$(_hasg --prefix=3D\* "$@")
- : ${CONF_PREFIX:=3D/usr}
+ : ${CONF_PREFIX:=3D${EPREFIX}/usr}
CONF_PREFIX=3D${CONF_PREFIX#*=3D}
[[ ${CONF_PREFIX} !=3D /* ]] && CONF_PREFIX=3D"/${CONF_PREFIX}"
[[ ${CONF_LIBDIR} !=3D /* ]] && CONF_LIBDIR=3D"/${CONF_LIBDIR}"
@@ -431,15 +431,15 @@ econf() {
fi
=20
set -- \
- --prefix=3D/usr \
+ --prefix=3D"${EPREFIX}"/usr \
${CBUILD:+--build=3D${CBUILD}} \
--host=3D${CHOST} \
${CTARGET:+--target=3D${CTARGET}} \
- --mandir=3D/usr/share/man \
- --infodir=3D/usr/share/info \
- --datadir=3D/usr/share \
- --sysconfdir=3D/etc \
- --localstatedir=3D/var/lib \
+ --mandir=3D"${EPREFIX}"/usr/share/man \
+ --infodir=3D"${EPREFIX}"/usr/share/info \
+ --datadir=3D"${EPREFIX}"/usr/share \
+ --sysconfdir=3D"${EPREFIX}"/etc \
+ --localstatedir=3D"${EPREFIX}"/var/lib \
"$@" \
${EXTRA_ECONF}
vecho "${ECONF_SOURCE}/configure" "$@"
@@ -477,22 +477,22 @@ einstall() {
=20
if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
if [ "${PORTAGE_DEBUG}" =3D=3D "1" ]; then
- ${MAKE:-make} -n prefix=3D"${D}usr" \
- datadir=3D"${D}usr/share" \
- infodir=3D"${D}usr/share/info" \
- localstatedir=3D"${D}var/lib" \
- mandir=3D"${D}usr/share/man" \
- sysconfdir=3D"${D}etc" \
+ ${MAKE:-make} -n prefix=3D"${ED}usr" \
+ datadir=3D"${ED}usr/share" \
+ infodir=3D"${ED}usr/share/info" \
+ localstatedir=3D"${ED}var/lib" \
+ mandir=3D"${ED}usr/share/man" \
+ sysconfdir=3D"${ED}etc" \
${LOCAL_EXTRA_EINSTALL} \
${MAKEOPTS} ${EXTRA_EMAKE} -j1 \
"$@" install
fi
- ${MAKE:-make} prefix=3D"${D}usr" \
- datadir=3D"${D}usr/share" \
- infodir=3D"${D}usr/share/info" \
- localstatedir=3D"${D}var/lib" \
- mandir=3D"${D}usr/share/man" \
- sysconfdir=3D"${D}etc" \
+ ${MAKE:-make} prefix=3D"${ED}usr" \
+ datadir=3D"${ED}usr/share" \
+ infodir=3D"${ED}usr/share/info" \
+ localstatedir=3D"${ED}var/lib" \
+ mandir=3D"${ED}usr/share/man" \
+ sysconfdir=3D"${ED}etc" \
${LOCAL_EXTRA_EINSTALL} \
${MAKEOPTS} ${EXTRA_EMAKE} -j1 \
"$@" install || die "einstall failed"
@@ -589,7 +589,7 @@ has_version() {
"$PORTAGE_BIN_PATH"/ebuild-ipc has_version "$ROOT" "$1"
else
PYTHONPATH=3D${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
- "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" ha=
s_version "${ROOT}" "$1"
+ "${PORTAGE_PYTHON:-@PORTAGE_PREFIX_PYTHON@}" "${PORTAGE_BIN_PATH}/port=
ageq" has_version "${ROOT}" "$1"
fi
local retval=3D$?
case "${retval}" in
@@ -610,7 +610,7 @@ best_version() {
"$PORTAGE_BIN_PATH"/ebuild-ipc best_version "$ROOT" "$1"
else
PYTHONPATH=3D${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
- "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" be=
st_version "${ROOT}" "$1"
+ "${PORTAGE_PYTHON:-@PORTAGE_PREFIX_PYTHON@}" "${PORTAGE_BIN_PATH}/port=
ageq" best_version "${ROOT}" "$1"
fi
local retval=3D$?
case "${retval}" in
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index a84a125..935adc4 100644
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@PORTAGE_PREFIX_BASH@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
=20
@@ -88,6 +88,9 @@ save_ebuild_env() {
# user config variables
unset DOC_SYMLINKS_DIR INSTALL_MASK PKG_INSTALL_MASK
=20
+ # Prefix additions
+ unset BPREFIX DEFAULT_PATH EPREFIX EXTRA_PATH PORTAGE_GROUP PORTAGE_USE=
R
+
declare -p
declare -fp
if [[ ${BASH_VERSINFO[0]} =3D=3D 3 ]]; then