jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: full switch to void-packages.

Browse source
This commit is contained in:
Juan RP 2014-10-11 11:15:02 +02:00
parent 4b6129eeb7
commit 6928b52a4e
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/xbps-src/shutils/chroot.sh
View file

@ -28,7 +28,7 @@ XBPS_SRC_VERSION="$XBPS_SRC_VERSION"
. /etc/xbps/xbps-src.conf . /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@@ \ 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" \ CCACHE_DIR="/ccache" IN_CHROOT=1 LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \

2
etc/defaults.conf
View file

@ -15,7 +15,7 @@
# #
# [REQUIRED] # [REQUIRED]
# Master directory. This is where the packages are built and installed. # 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_MASTERDIR=${HOME}/masterdir

10
xbps-src
View file

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