diff options
| -rwxr-xr-x | bin/ebuild-helpers/emake | 5 | ||||
| -rw-r--r-- | make.conf.txt | 5 | ||||
| -rw-r--r-- | man/ebuild.5 | 4 | ||||
| -rw-r--r-- | man/emerge.1 | 4 | ||||
| -rw-r--r-- | man/make.conf.5 | 4 | ||||
| -rw-r--r-- | man/portage.5 | 20 | ||||
| -rw-r--r-- | pym/_emerge/actions.py | 8 |
7 files changed, 30 insertions, 20 deletions
diff --git a/bin/ebuild-helpers/emake b/bin/ebuild-helpers/emake index ca1901ef9..d842781a7 100755 --- a/bin/ebuild-helpers/emake +++ b/bin/ebuild-helpers/emake @@ -6,9 +6,8 @@ # only parameter supplied is -jN, where N is a number of # parallel processes that should be ideal for the running host # (e.g. on a single-CPU machine, N=2). The MAKEOPTS variable -# is set in /etc/make.globals. We don't source -# /etc/make.globals here because emake is only called from an -# ebuild. +# is set in make.globals. We don't source make.globals +# here because emake is only called from an ebuild. source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh diff --git a/make.conf.txt b/make.conf.txt index 5482b5021..4531ed859 100644 --- a/make.conf.txt +++ b/make.conf.txt @@ -17,7 +17,8 @@ first for any settings. If no environment settings are found, Portage then checks /etc/make.conf. If no setting is found in /etc/make.conf, Portage checks the profile's default setting from /etc/make.profile/make.defaults. If no setting is found there, -it finally checks /etc/make.globals. Please note that all user +it finally checks make.globals. +Please note that all user settings should be made in the environment or in /etc/make.conf, which is intended to be customized by the user. @@ -692,7 +693,7 @@ FILES /etc/make.conf Contains user-supplied variables and overwrites those in make.defaults. -/etc/make.globals +/usr/share/portage/config/make.globals Contains portage defaults for many variables listed here. Don't change this, edit /etc/make.conf instead. diff --git a/man/ebuild.5 b/man/ebuild.5 index 1fcc383ee..8fa32e23f 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -811,7 +811,7 @@ variable which is disregarded for prior \fBEAPI\fR values. .TP \fBemake\fR \fI[make options]\fR This is used as a replacement for make. Performs 'make ${MAKEOPTS} -\fImake options\fR' (as set in /etc/make.globals), default is MAKEOPTS="\-j2". +\fImake options\fR' (as set in make.globals), default is MAKEOPTS="\-j2". \fB***warning***\fR .br @@ -1101,7 +1101,7 @@ The helper apps in \fI/usr/lib/portage/bin\fR. .B /etc/make.conf Contains variables for the build\-process and overwrites those in make.defaults. .TP -.B /etc/make.globals +.B /usr/share/portage/config/make.globals Contains the default variables for the build\-process, you should edit \fI/etc/make.conf\fR instead. .TP diff --git a/man/emerge.1 b/man/emerge.1 index 73c90d3fd..0f2360ff0 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -827,7 +827,7 @@ little bit untidy, it does prevent potentially valuable config files from being deleted, which is of paramount importance. .LP Protected directories are set using the \fICONFIG_PROTECT\fR variable, normally -defined in /etc/make.globals. Directory exceptions to the CONFIG_PROTECTed +defined in make.globals. Directory exceptions to the CONFIG_PROTECTed directories can be specified using the \fICONFIG_PROTECT_MASK\fR variable. To find files that need to be updated in /etc, type \fBfind /etc \-iname \'._cfg????_*\'\fR. .LP @@ -903,7 +903,7 @@ Contains a list of default packages used to resolve virtual dependencies. Contains a list of packages used for the base system. The \fBsystem\fR and \fBworld\fR sets consult this file. \fBDo not edit this file\fR. .TP -.B /etc/make.globals +.B /usr/share/portage/config/make.globals Contains the default variables for the build process. \fBDo not edit this file\fR. .SH "SEE ALSO" diff --git a/man/make.conf.5 b/man/make.conf.5 index 540a15e4b..cbedc3d19 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -8,7 +8,7 @@ This file contains various variables that are used by Portage. Portage will check the currently\-defined environment variables first for any settings. If no environment settings are found, Portage then checks /etc/make.conf. If no setting is found -in /etc/make.conf, Portage checks /etc/make.globals. If no +in make.conf, Portage checks make.globals. If no setting is found there, the profile's default setting is grabbed from /etc/make.profile/make.defaults. Please note that all user settings should be made in the environment or in /etc/make.conf, @@ -812,7 +812,7 @@ Saleem Abdulrasool <compnerd@gentoo.org> \fB/etc/make.conf\fR and \fB/etc/portage/make.conf\fR Contains variables for the build\-process and overwrites those in make.defaults. .TP -.B /etc/make.globals +.B /usr/share/portage/config/make.globals Contains the default variables for the build\-process, you should edit \fI/etc/make.conf\fR instead. .TP .B /etc/portage/color.map diff --git a/man/portage.5 b/man/portage.5 index 41224deb3..3a472a8ac 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -17,7 +17,6 @@ If you are looking for information on how to emerge something, please see .TP .BR /etc/ .nf -make.globals .BR make.conf (5) .fi .TP @@ -87,6 +86,11 @@ use.desc use.local.desc .fi .TP +.BR /usr/share/portage/config/ +.nf +make.globals +.fi +.TP .BR /var/cache/edb/ misc internal cache files .TP @@ -136,11 +140,6 @@ More reading: .BR /etc/ .RS .TP -.BR make.globals -The global default settings for Portage. This comes from the portage package -itself. Settings in \fBmake.conf\fR override values here. The format -is described extensivly in \fBmake.conf\fR(5). -.TP .BR make.conf The global custom settings for Portage. See \fBmake.conf\fR(5). .RE @@ -869,6 +868,15 @@ games\-emulation/xmess:net \- Adds network support .fi .RE .TP +.BR /usr/share/portage/config/ +.RS +.TP +.BR make.globals +The global default settings for Portage. This comes from the portage package +itself. Settings in \fBmake.conf\fR override values here. The format +is described extensivly in \fBmake.conf\fR(5). +.RE +.TP .BR /var/cache/edb/ .RS This directory is used to store internal portage cache files. The names and diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index fb692c363..033a7d0bb 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -27,7 +27,7 @@ from portage import os from portage import digraph from portage import _unicode_decode, _unicode_encode from portage.cache.cache_errors import CacheError -from portage.const import NEWS_LIB_PATH +from portage.const import GLOBAL_CONFIG_PATH, NEWS_LIB_PATH from portage.dbapi.dep_expand import dep_expand from portage.output import blue, bold, colorize, create_color_func, darkgreen, \ red, yellow @@ -1814,7 +1814,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): myportdir = portdb.porttree_root out = portage.output.EOutput() if not myportdir: - sys.stderr.write("!!! PORTDIR is undefined. Is /etc/make.globals missing?\n") + sys.stderr.write("!!! PORTDIR is undefined. " + \ + "Is %s/make.globals missing?\n" % GLOBAL_CONFIG_PATH) sys.exit(1) if myportdir[-1]=="/": myportdir=myportdir[:-1] @@ -1853,7 +1854,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): syncuri = settings.get("SYNC", "").strip() if not syncuri: - writemsg_level("!!! SYNC is undefined. Is /etc/make.globals missing?\n", + writemsg_level("!!! SYNC is undefined. " + \ + "Is %s/make.globals missing?\n" % GLOBAL_CONFIG_PATH, noiselevel=-1, level=logging.ERROR) return 1 |