From 96b053ac52fa37fdd61cbb76cb44dfb90fb49f86 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 12 Sep 2012 00:28:51 -0700 Subject: Prefer /etc/portage/make.profile. 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). --- man/emerge.1 | 6 +++--- man/make.conf.5 | 4 ++-- man/portage.5 | 20 ++++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'man') diff --git a/man/emerge.1 b/man/emerge.1 index 679349054..a25c573bb 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -1083,7 +1083,7 @@ Contains user package set definitions (see \fBportage\fR(5)). Contains settings to handle automatic updates/backups of configuration files. .TP -.B /etc/make.profile/make.defaults +.B /etc/portage/make.profile/make.defaults Contains profile\-specific variables for the build process. \fBDo not edit this file\fR. .TP @@ -1091,11 +1091,11 @@ edit this file\fR. Contains the master list of USE flags with descriptions of their functions. \fBDo not edit this file\fR. .TP -.B /etc/make.profile/virtuals +.B /etc/portage/make.profile/virtuals Contains a list of default packages used to resolve virtual dependencies. \fBDo not edit this file\fR. .TP -.B /etc/make.profile/packages +.B /etc/portage/make.profile/packages 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 diff --git a/man/make.conf.5 b/man/make.conf.5 index d9babe10f..e2a16a51d 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -13,7 +13,7 @@ Portage then checks the make.conf files. Both /etc/make.conf and If no setting is found in the make.conf files, 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 +from /etc/portage/make.profile/make.defaults. Please note that all user settings should be made in the environment or in the make.conf files, which are intended to be customized by the user. .br @@ -855,7 +855,7 @@ This variable controls permissions for \fIWORKDIR\fR (see \fBebuild\fR(5)). \fBPORTDIR\fR = \fI[path]\fR Defines the location of the Portage tree. This is the repository for all profile information as well as all ebuilds. If you change this, you must update -your /etc/make.profile symlink accordingly. +your /etc/portage/make.profile symlink accordingly. .br Defaults to /usr/portage. .br 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 -- cgit v1.2.3-1-g7c22