aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gmail.com>2015-06-22 23:13:25 -0400
committerTim Harder <radhermit@gmail.com>2015-06-28 11:46:59 -0400
commitfbf058ae16427bffd4c342bf17e7797cd0dcb397 (patch)
tree27e235a1062167b98e9c8d25a3b8eddbf9413a21
parentupdate another pkgcore-check -> pkgcheck reference (diff)
downloadpkgcore-fbf058ae16427bffd4c342bf17e7797cd0dcb397.tar.gz
pkgcore-fbf058ae16427bffd4c342bf17e7797cd0dcb397.tar.bz2
pkgcore-fbf058ae16427bffd4c342bf17e7797cd0dcb397.zip
change DISTDIR, PKGDIR, and "PORTDIR" defaults
Everything is now anchored under /var/gentoo, note that /var/cache/gentoo wasn't chosen since various data might not be able to be regenerated, e.g. certain binary pkgs in PKGDIR or locally modified ebuilds that aren't committed anywhere else. The defaults are now as follows: DISTDIR=/var/gentoo/dist PKGDIR=/var/gentoo/pkgs PORTDIR=/var/gentoo/repos/gentoo Note that PORTDIR isn't actually supported anymore but all repos will be available under /var/gentoo/repos/<repo_name> where repo_name should generally be the matching name from the repo metadata.
-rw-r--r--NEWS.rst4
-rw-r--r--config/make.globals4
-rw-r--r--config/repos.conf2
3 files changed, 7 insertions, 3 deletions
diff --git a/NEWS.rst b/NEWS.rst
index d42490580..80915fb15 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -14,6 +14,10 @@ pkgcore master
- Drop deprecated support for /etc/make.conf, only /etc/portage/make.conf is
used now.
+- Change default locations for DISTDIR, PKGDIR, and repos to be
+ /var/gentoo/dist, /var/gentoo/pkgs, and /var/gentoo/repos/* (e.g. the main
+ gentoo repo would be at /var/gentoo/repos/gentoo), respectively.
+
------------------------
pkgcore 0.9 (2015-04-01)
diff --git a/config/make.globals b/config/make.globals
index c7dbcfec2..238ca6d9b 100644
--- a/config/make.globals
+++ b/config/make.globals
@@ -8,8 +8,8 @@ ACCEPT_LICENSE="* -@EULA"
ACCEPT_PROPERTIES="*"
ACCEPT_RESTRICT="*"
-DISTDIR="/usr/portage/distfiles"
-PKGDIR="/usr/portage/packages"
+DISTDIR="/var/gentoo/dist"
+PKGDIR="/var/gentoo/pkgs"
PORTAGE_TMPDIR="/var/tmp"
diff --git a/config/repos.conf b/config/repos.conf
index 8c657daae..a93987d54 100644
--- a/config/repos.conf
+++ b/config/repos.conf
@@ -2,6 +2,6 @@
main-repo = gentoo
[gentoo]
-location = /usr/portage
+location = /var/gentoo/repos/gentoo
sync-type = rsync
sync-uri = rsync://rsync.gentoo.org/gentoo-portage