diff options
| -rw-r--r-- | profiles/default/make.defaults | 8 | ||||
| -rw-r--r-- | sys-apps/portage/files/1.5/bin/env-update | 4 | ||||
| -rw-r--r-- | sys-apps/portage/files/1.5/cnf/make.globals | 2 | ||||
| -rwxr-xr-x | sys-apps/portage/files/1.5/pym/portage.py | 25 |
4 files changed, 24 insertions, 15 deletions
diff --git a/profiles/default/make.defaults b/profiles/default/make.defaults index 9db74c6959f1..56f4e7792145 100644 --- a/profiles/default/make.defaults +++ b/profiles/default/make.defaults @@ -1,10 +1,6 @@ # Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc. # System-wide defaults for the Portage system -ROOT="/" - -MAINTAINER="yes" - #proxy settings PROXY(both), or HTTP_PROXY/FTP_PROXY #PROXY=freebox.gentoo.org:3128 #HTTP_PROXY= @@ -45,8 +41,4 @@ CFLAGS="-O2 -mpentium" # C++ Compiler flags CXXFLAGS=${CFLAGS} -#Debug build -- if defined, binaries won't be stripped #DEBUG=true - -#Package Mode - tbz2 or tgz (what binary package mode) -PACKAGE=tbz2 diff --git a/sys-apps/portage/files/1.5/bin/env-update b/sys-apps/portage/files/1.5/bin/env-update index e69de29bb2d1..20c3127be1b1 100644 --- a/sys-apps/portage/files/1.5/bin/env-update +++ b/sys-apps/portage/files/1.5/bin/env-update @@ -0,0 +1,4 @@ +#!/usr/bin/spython + +import portage +portage.env_update() diff --git a/sys-apps/portage/files/1.5/cnf/make.globals b/sys-apps/portage/files/1.5/cnf/make.globals index 6bf6f0455a2b..78d8a4bc2142 100644 --- a/sys-apps/portage/files/1.5/cnf/make.globals +++ b/sys-apps/portage/files/1.5/cnf/make.globals @@ -20,6 +20,8 @@ DISTDIR=${PORTDIR}/distfiles PKGDIR=${PORTDIR}/packages RPMDIR=${PORTDIR}/rpm CURRENTFILE=${PORTDIR}/current-packages +SYSPROFILE=default +SYSPROFILEDIR=${PORTDIR}/profiles PLATFORM=$CHOST # Options passed to make during the build process diff --git a/sys-apps/portage/files/1.5/pym/portage.py b/sys-apps/portage/files/1.5/pym/portage.py index 36c85e7b80b6..169dcd7e0274 100755 --- a/sys-apps/portage/files/1.5/pym/portage.py +++ b/sys-apps/portage/files/1.5/pym/portage.py @@ -343,17 +343,28 @@ def getsetting(mykey,root="/",env=1,recdepth=0): else: print "!!! Error:",root+"etc/make.globals not found." sys.exit(1) - if os.path.exists(root+"etc/make.profile/make.defaults"): - configdefaults=getconfig(root+"etc/make.profile/make.defaults") - else: - print "!!! Error:",root+"etc/make.profile/make.defaults not found." - print "!!! (make.profile should be a symlink pointing to your current system profile)" - sys.exit(1) if os.path.exists(root+"etc/make.conf"): configsettings=getconfig(root+"etc/make.conf") else: configsettings={} - + + myvals={"SYSPROFILE":None, "SYSPROFILEDIR":None} + for x in myvals.keys(): + if configsettings.has_key(x): + myvals[x]=configsettings[x] + elif configglobals.has_key(x): + myvals[x]=configglobals[x] + else: + print "!!! Error: couldn't find",x,"setting in /etc/make.conf or /etc/make.globals" + sys.exit(1) + + myprofile=os.path.normpath(root+myvals["SYSPROFILEDIR"]+"/"+myvals["SYSPROFILE"]) + if os.path.exists(myprofile): + configdefaults=getconfig(myprofile) + else: + print "!!! Error: SYSPROFILEDIR/SYSPROFILE specify a non-existent profile." + sys.exit(1) + mystring=None if env: if os.environ.has_key(mykey): |