[PATCH 2/9] organize /var/cache/pbuilder related path

[Loïc Minier]

---
 pbuilderrc |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/pbuilderrc b/pbuilderrc
index af91ace..2530d63 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -16,17 +16,37 @@
 # "/etc/pbuilderrc" may be overriden by "/etc/pbuilder/bar.rc" 
 # if this exists.
 #######################################################################
+# path to use when "pbuilder" is executed
+# ---------------------------------------------------------------------
+# chroot file system in tar.gz
+# ${BASETGZ}       : default is "/var/cache/pbuilder/base.tgz" 
 BASETGZ="${PBUILDER_CACHEDIR}/${PROFILE:+$PROFILE/}base.tgz"
+
+# chroot mount point (it may be appended by $$/)
+# ${BUILDPLACE}    : default is "/var/cache/pbuilder/build/"
+BUILDPLACE="${PBUILDER_CACHEDIR}/${PROFILE:+$PROFILE/}build/"
+
+# directory to keep generated packages
+# ${BUILDRESULT}   : default is "/var/cache/pbuilder/result/"
+BUILDRESULT="${PBUILDER_CACHEDIR}/${PROFILE:+$PROFILE/}result/"
+
+# specify the cache for APT 
+# ${APTCACHE}      : default is "/var/cache/pbuilder/aptcache/"
+APTCACHE="${PBUILDER_CACHEDIR}/${PROFILE:+$PROFILE/}aptcache/"
+
+# NB: this var is private to pbuilder; ccache uses "CCACHE_DIR" instead
+# ${CCACHEDIR}     : default is "/var/cache/pbuilder/ccache"
+CCACHEDIR="${PBUILDER_CACHEDIR}/${PROFILE:+$PROFILE/}ccache"
+
+#######################################################################
 #EXTRAPACKAGES=""
 #export DEBIAN_BUILDARCH=athlon
-BUILDPLACE="${PBUILDER_CACHEDIR}/${PROFILE:+$PROFILE/}build/"
 MIRRORSITE=http://cdn.debian.net/debian
 #OTHERMIRROR="deb http://www.home.com/updates/ ./"
 #export http_proxy=http://your-proxy:8080/
 USEPROC=yes
 USEDEVPTS=yes
 USEDEVFS=no
-BUILDRESULT="${PBUILDER_CACHEDIR}/${PROFILE:+$PROFILE/}result/"
 
 # specifying the distribution forces the distribution on "pbuilder update"
 #DISTRIBUTION=sid
@@ -38,13 +58,11 @@ BUILDRESULT="${PBUILDER_CACHEDIR}/${PROFILE:+$PROFILE/}result/"
 # restricted universe multiverse"
 COMPONENTS="main"
 #specify the cache for APT 
-APTCACHE="${PBUILDER_CACHEDIR}/${PROFILE:+$PROFILE/}aptcache/"
 APTCACHEHARDLINK="yes"
 REMOVEPACKAGES=""
 #HOOKDIR="/usr/lib/pbuilder/hooks"
 HOOKDIR=""
 # NB: this var is private to pbuilder; ccache uses "CCACHE_DIR" instead
-CCACHEDIR="${PBUILDER_CACHEDIR}/${PROFILE:+$PROFILE/}ccache"
 
 # make debconf not interact with user
 export DEBIAN_FRONTEND="noninteractive"
-- 
1.6.5