diff options
| author | Mike Frysinger <vapier@google.com> | 2015-05-31 05:31:55 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2015-05-31 05:31:55 -0400 |
| commit | 0aca5459c59b848a81838208ae5b10cd41b9b733 (patch) | |
| tree | 3fb97aea115c44eae234e0dd7a445d9b488ef129 | |
| parent | fd0cdbb10edb2025c69a8662647ba0a369bb8d1b (diff) | |
| download | portage-0aca5459c59b848a81838208ae5b10cd41b9b733.tar.gz | |
rewrite make.globals to use EPREFIX
BUG=b:20895978
Change-Id: Id1877bb64ae6f3e1c7a048bd07e94fbad2f70827
| -rw-r--r-- | usr/share/portage/config/make.globals | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr/share/portage/config/make.globals b/usr/share/portage/config/make.globals index e901e6b..47524bb 100644 --- a/usr/share/portage/config/make.globals +++ b/usr/share/portage/config/make.globals @@ -28,12 +28,12 @@ ACCEPT_PROPERTIES="*" ACCEPT_RESTRICT="*" # Miscellaneous paths -DISTDIR="/usr/local/google/home/vapier/src/android/mdk/build/portage/tmp/prefix-portage-2.2.14/destdir/usr/portage/distfiles" -PKGDIR="/usr/local/google/home/vapier/src/android/mdk/build/portage/tmp/prefix-portage-2.2.14/destdir/usr/portage/packages" -RPMDIR="/usr/local/google/home/vapier/src/android/mdk/build/portage/tmp/prefix-portage-2.2.14/destdir/usr/portage/rpm" +DISTDIR="${EPREFIX}/usr/portage/distfiles" +PKGDIR="${EPREFIX}/usr/portage/packages" +RPMDIR="${EPREFIX}/usr/portage/rpm" # Temporary build directory -PORTAGE_TMPDIR="/usr/local/google/home/vapier/src/android/mdk/build/portage/tmp/prefix-portage-2.2.14/destdir/var/tmp" +PORTAGE_TMPDIR="${EPREFIX}/var/tmp" # Fetching command (3 tries, passive ftp for firewall compatibility) FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" @@ -129,13 +129,13 @@ PORTAGE_INST_UID="145691" PORTAGE_INST_GID="5000" # Default PATH for ebuild env -DEFAULT_PATH="/usr/local/google/home/vapier/src/android/mdk/build/portage/tmp/prefix-portage-2.2.14/destdir/usr/sbin:/usr/local/google/home/vapier/src/android/mdk/build/portage/tmp/prefix-portage-2.2.14/destdir/usr/bin:/usr/local/google/home/vapier/src/android/mdk/build/portage/tmp/prefix-portage-2.2.14/destdir/sbin:/usr/local/google/home/vapier/src/android/mdk/build/portage/tmp/prefix-portage-2.2.14/destdir/bin" +DEFAULT_PATH="${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin" # Any extra PATHs to add to the ebuild environment's PATH (if any) EXTRA_PATH="" # The offset prefix this Portage was configured with (not used by # Portage itself) -CONFIGURE_EPREFIX="/usr/local/google/home/vapier/src/android/mdk/build/portage/tmp/prefix-portage-2.2.14/destdir" +CONFIGURE_EPREFIX="${EPREFIX}" # Mode bits for ${WORKDIR} (see ebuild.5). PORTAGE_WORKDIR_MODE="0700" |