diff options
author | 2004-11-07 13:15:29 +0000 | |
---|---|---|
committer | 2004-11-07 13:15:29 +0000 | |
commit | 3452b6a15d100eca0ebd0c07c41cbc6fd001a3e2 (patch) | |
tree | 626cefe67511f9ad211caa06dcbfcc5431cabb9a /cnf | |
parent | Compatability hack to treat USE="selinux" as both a feature, and use. With the (diff) | |
download | portage-cvs-3452b6a15d100eca0ebd0c07c41cbc6fd001a3e2.tar.gz portage-cvs-3452b6a15d100eca0ebd0c07c41cbc6fd001a3e2.tar.bz2 portage-cvs-3452b6a15d100eca0ebd0c07c41cbc6fd001a3e2.zip |
Merge of the ebuild-daemon code (ebuild.py), along with massive shifts/cleanup/fixes. At this
point, the env of an ebuild *should* be perfectly preserved, and used. This deprecates
portage.doebuild, in favor of eventually calling an ebuild.py:process_phase. The
code of doebuild now exists as ebuild.py:__adjust_env. That code needs cleanup,
and splitting. Rough stats for the daemonized ebuild processor code is a 33% reduction
in run time for a full regen, with the initial framework laid out to allow parallel
regens on smp systems. Aside from making all of the previous refactorings active
(sync refactoring in emerge, transports refactoring in portage.py and repoman), this
adds the following-
portage.exit_callbacks- append a function to this list, and it'll be exited at shutdown
FEATURES="verify-rdepend"- don't trust the packages stated rdepends, ldd the crap out of
the package to verify it. When severe is on, bail, if unstated rdepends are encountered.
FEATURES="prelink"- do prelinking of binaries after merging.
FEATURES="userpriv_fakeroot"- run the install phase in userpriv'd fakeroot instance, removing
the root requirement for all building phases but setup
FEATURES="confcache"- a implementation of stuart's confcache alg, minus the sandbox
modifications.
FEATURES="parallel-fetch"- bug #1661, fork and fetch while merging. Requires distlocks to be
enabled, and only kicks in when more then one package is being merged. This is based on
portage_exec.spawn_func, and depgraph.__fetch.
Aside from the feature additions, a large amount of code shifting to break the need for
portage_exec.spawn_func, and depgraph.__fetch.
Aside from the feature additions, a large amount of code shifting to break the need for
globals, and try to centralize the code for modularizing (this is the start of it).
A large amount of code cleanup in addition.
Diffstat (limited to 'cnf')
-rw-r--r-- | cnf/make.conf | 45 |
1 files changed, 44 insertions, 1 deletions
diff --git a/cnf/make.conf b/cnf/make.conf index c7918be..3d756e3 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.84 2004/10/10 23:27:28 carpaski Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.85 2004/11/07 13:15:29 ferringb Exp $ # Contains local system settings for Portage system # Please review 'man make.conf' for more information. @@ -201,6 +201,37 @@ CHOST="i686-pc-linux-gnu" # stress on particular mirrors. Instead you may use one of the following # continent specific rotations: # +# SYNC refactoring code is now in. This means that your SYNC var just got a wee +# bit more interesting. +# +# for CVS +# old format: cvs://user@host:cvsroot +# this is deprecated. it assumes gentoo-x86, and ssh. +# +# Use the new format. +# +# new format: cvs://[CVS_RSH:]user@host:cvsroot:cvs-module +# example- +# cvs://ssh:ferringb@cvs.gentoo.org:/var/cvsroot:gentoo-x86 +# if, for example, I wanted CVS_RSH to be rsh- +# cvs://ssh:ferringb@cvs.gentoo.org:/var/cvsroot:gentoo-x86 +# +# if you're just after a straight cvs connection, pserver fex +# cvs://user@host:cvsroot:cvs-module +# +# currently, it shouldn't support specifying a local cvs root. +# this will be added. +# +# for snaphots (previously emerge-webrsync) +# snapshot[-mirror] +# +# using +# SYNC="snapshot" +# will randomly choose a mirror to use to +# +# to set it explicitly- use this as an example +# snapshot-http://gentoo.chem.wisc.edu/gentoo/snapshots +# # Default: "rsync://rsync.gentoo.org/gentoo-portage" # North America: "rsync://rsync.namerica.gentoo.org/gentoo-portage" # South America: "rsync://rsync.samerica.gentoo.org/gentoo-portage" @@ -281,12 +312,24 @@ CHOST="i686-pc-linux-gnu" # after a merge -- for debugging purposes only. # 'nostrip' prevents the stripping of binaries. # 'notitles' disables xterm titlebar updates (which contain status info). +# 'parallel-fetch' +# enable parallel merging/fetching where it makes sense. +# 'prelink' Prelink binaries automatically when merging. # 'sandbox' enables sandboxing when running emerge and ebuild. +# 'selinux' Enable selinux features, labeling fex. This should be used in +# conjunction with USE="selinux". # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. +# 'verify-rdepend' +# Don't trust the ebuilds stated RDEPENDS. Verify it. # 'userpriv' allows portage to drop root privileges while it is compiling, # as a security measure. As a side effect this can remove # sandbox access violations for users. +# 'userpriv_fakeroot' +# use fakeroot to run the install phase as a non-root user. +# FEATURES="userpriv_fakeroot userpriv usersandbox sandbox" is +# currently the most de-prived you can run- pkg_setup still runs +# as root, although most pkgs don't require it. # 'usersandbox' enables sandboxing while portage is running under userpriv. #FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" #FEATURES="sandbox ccache distcc distlocks autoaddcvs" |