xbps-src: full switch to void-packages.

common/xbps-src/shutils/chroot.sh

@@ -28,7 +28,7 @@ XBPS_SRC_VERSION="$XBPS_SRC_VERSION"
 
 . /etc/xbps/xbps-src.conf
 
-PATH=/xbps-packages:/usr/bin:/usr/sbin
+PATH=/void-packages:/usr/bin:/usr/sbin
 
 exec env -i PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/distcc" @@XARCH@@ \
     CCACHE_DIR="/ccache" IN_CHROOT=1 LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \

etc/defaults.conf

@@ -15,7 +15,7 @@
 #
 # [REQUIRED]
 # Master directory. This is where the packages are built and installed.
-# By default set to xbps-packages/masterdir.
+# By default set to void-packages/masterdir.
 #
 #XBPS_MASTERDIR=${HOME}/masterdir
 

xbps-src

@@ -129,7 +129,7 @@ Options:
     Absolute path to a directory to be bind mounted at <masterdir>/host.
     The host directory stores binary packages, sources and package dependencies
     downloaded from remote repositories.
-    If unset defaults to xbps-packages/hostdir.
+    If unset defaults to void-packages/hostdir.
 
 -h  Usage output.
 
@@ -142,7 +142,7 @@ Options:
 -m  <masterdir>
     Absolute path to a directory to be used as masterdir.
     The masterdir is the main directory to build/store/compile packages.
-    If unset defaults to xbps-packages/masterdir.
+    If unset defaults to void-packages/masterdir.
 
 -N  Disable use of remote repositories to resolve dependencies.
 
@@ -356,7 +356,7 @@ check_reqhost_utils
 
 if [ -n "$IN_CHROOT" ]; then
     readonly XBPS_CONFIG_FILE=/etc/xbps/xbps-src.conf
-    readonly XBPS_DISTDIR=/xbps-packages
+    readonly XBPS_DISTDIR=/void-packages
 else
     _distdir="$(readlink -f $(dirname $0))"
     if [ "${_distdir}" = "." ]; then
@@ -397,8 +397,8 @@ if [ -n "$IN_CHROOT" ]; then
     readonly XBPS_RINDEX_CMD="xbps-rindex"
     readonly XBPS_RECONFIGURE_CMD="xbps-reconfigure"
     readonly XBPS_REMOVE_CMD="xbps-remove"
-    readonly XBPS_SRCPKGDIR=/xbps-packages/srcpkgs
-    readonly XBPS_COMMONDIR=/xbps-packages/common
+    readonly XBPS_SRCPKGDIR=/void-packages/srcpkgs
+    readonly XBPS_COMMONDIR=/void-packages/common
     readonly XBPS_DESTDIR=/destdir
     readonly XBPS_BUILDDIR=/builddir
     readonly XBPS_SHUTILSDIR=$XBPS_COMMONDIR/xbps-src/shutils