summaryrefslogtreecommitdiffstats
path: root/man/portage.5
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-09-12 00:28:51 -0700
committerZac Medico <zmedico@gentoo.org>2012-09-12 00:28:51 -0700
commit96b053ac52fa37fdd61cbb76cb44dfb90fb49f86 (patch)
treeb1011e1b62a08e7b3da14bc097f60dbea72c830d /man/portage.5
parentea54077b59d2aec35add5c3f6779b6772f3127a5 (diff)
downloadportage-96b053ac52fa37fdd61cbb76cb44dfb90fb49f86.tar.gz
portage-96b053ac52fa37fdd61cbb76cb44dfb90fb49f86.tar.bz2
portage-96b053ac52fa37fdd61cbb76cb44dfb90fb49f86.zip
Prefer /etc/portage/make.profile.v2.2.0_alpha126
This is the default location used by current versions of eselect profile, and will soon be the default location in stages. Since eselect profile generates a warning if both /etc/make.profile and /etc/portage/make.profile exist, the new default should be fairly safe (although eselect profile currently prefers /etc/make.profile when both exist).
Diffstat (limited to 'man/portage.5')
-rw-r--r--man/portage.520
1 files changed, 10 insertions, 10 deletions
diff --git a/man/portage.5 b/man/portage.5
index fc36ddbec..49f8dcda0 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -20,7 +20,7 @@ If you are looking for information on how to emerge something, please see
.BR make.conf (5)
.fi
.TP
-\fB/etc/make.profile/\fR or \fB/etc/portage/make.profile/\fR
+\fB/etc/portage/make.profile/\fR or \fB/etc/make.profile/\fR
site\-specific overrides go in \fB/etc/portage/profile/\fR
.nf
deprecated
@@ -67,7 +67,7 @@ repos.conf
package-specific bashrc files
.TP
.BR /etc/portage/profile/
-site-specific overrides of \fB/etc/make.profile/\fR
+site-specific overrides of \fB/etc/portage/make.profile/\fR
.TP
.BR /etc/portage/sets/
user\-defined package sets
@@ -201,18 +201,18 @@ More reading:
The global custom settings for Portage. See \fBmake.conf\fR(5).
.RE
.TP
-\fB/etc/make.profile/\fR or \fB/etc/portage/make.profile/\fR
+\fB/etc/portage/make.profile/\fR or \fB/etc/make.profile/\fR
This is usually just a symlink to the correct profile in
\fB/usr/portage/profiles/\fR. Since it is part of the portage tree, it
may easily be updated/regenerated by running `emerge \-\-sync`. It defines
what a profile is (usually arch specific stuff). If you need a custom
-profile, then you should make your own \fB/etc/make.profile/\fR
+profile, then you should make your own \fBmake.profile\fR
directory and populate it. However, if you just wish to override some
settings, use \fB/etc/portage/profile/\fR (it supports all of the same file
-types that \fB/etc/make.profile/\fR does, except parent). Do NOT edit the
-settings in \fB/etc/make.profile/\fR because they WILL be lost with the next
-`emerge \-\-sync`. If both \fB/etc/make.profile/\fR and
-\fB/etc/portage/make.profile/\fR exist, then \fB/etc/make.profile/\fR
+types that \fBmake.profile\fR does, except parent). Do NOT edit the
+settings in \fBmake.profile\fR because they WILL be lost with the next
+`emerge \-\-sync`. If both \fB/etc/portage/make.profile/\fR and
+\fB/etc/make.profile/\fR exist, then \fB/etc/portage/make.profile/\fR
will be preferred.
Any file in this directory, directories of other profiles or top-level
@@ -239,8 +239,8 @@ explaining how they can upgrade.
.nf
default-linux/x86/2005.0
# emerge -n '>=sys-apps/portage-2.0.51'
-# rm -f /etc/make.profile
-# ln -s /usr/portage/profiles/default-linux/alpha/2005.0 /etc/make.profile
+# rm -f /etc/portage/make.profile
+# ln -s /usr/portage/profiles/default-linux/alpha/2005.0 /etc/portage/make.profile
.fi
.TP
.BR eapi