moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: remove XBPS_DESTDIR from conf file.

Browse source 
Rather than make it configurable, put this always under
XBPS_MASTERDIR/pkg-destdir, so you don't have to care about it anymore.

--HG--
extra : convert_revision : 34cc3102272bfcf95b2fc3a8961cb9cb2429ab91
This commit is contained in:
Juan RP 2010-01-09 23:35:11 +01:00
parent 8d8fd35a75
commit 667095b4ae
5 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xbps-src/shutils/chroot.sh
View file

@ -199,7 +199,7 @@ mount_chroot_fs()
{
local cnt=
REQFS="sys proc dev xbps xbps_builddir xbps_destdir \
REQFS="sys proc dev xbps xbps_builddir \
xbps_packagesdir xbps_srcdistdir"
for f in ${REQFS}; do
@ -209,7 +209,6 @@ mount_chroot_fs()
case $f in
xbps) blah=$XBPS_DISTRIBUTIONDIR;;
xbps_builddir) blah=$XBPS_BUILDDIR;;
xbps_destdir) blah=$XBPS_DESTDIR;;
xbps_srcdistdir) blah=$XBPS_SRCDISTDIR;;
xbps_packagesdir) blah=$XBPS_PACKAGESDIR;;
*) blah=/$f;;
@ -292,7 +291,6 @@ XBPSSRC_CF=$XBPS_MASTERDIR/usr/local/etc/xbps-src.conf
echo "XBPS_DISTRIBUTIONDIR=/xbps" > $XBPSSRC_CF
echo "XBPS_MASTERDIR=/" >> $XBPSSRC_CF
echo "XBPS_DESTDIR=/xbps_destdir" >> $XBPSSRC_CF
echo "XBPS_PACKAGESDIR=/xbps_packagesdir" >> $XBPSSRC_CF
echo "XBPS_BUILDDIR=/xbps_builddir" >> $XBPSSRC_CF
echo "XBPS_SRCDISTDIR=/xbps_srcdistdir" >> $XBPSSRC_CF

3
xbps-src/shutils/common_funcs.sh
View file

@ -46,8 +46,7 @@ run_rootcmd()
[ -n "$in_chroot" ] && unset fakeroot_cmd
lenv="XBPS_DESTDIR=$XBPS_DESTDIR"
lenv="XBPS_DISTRIBUTIONDIR=$XBPS_DISTRIBUTIONDIR $lenv"
lenv="XBPS_DISTRIBUTIONDIR=$XBPS_DISTRIBUTIONDIR"
shift
if [ "$usesudo" = "yes" -a -z "$in_chroot" ]; then

8
xbps-src/shutils/pkgtarget_funcs.sh
View file

@ -153,13 +153,13 @@ remove_pkg()
stow_pkg_handler unstow || return $?
for subpkg in ${subpackages}; do
if [ -d $XBPS_DESTDIR/${subpkg}-${ver%_${revision}} ]; then
rm -rf $XBPS_DESTDIR/${subpkg}-${ver%_${revision}}
if [ -d "$XBPS_DESTDIR/${subpkg}-${ver%_*}" ]; then
rm -rf "$XBPS_DESTDIR/${subpkg}-${ver%_*}"
fi
done
if [ -d $XBPS_DESTDIR/${pkgname}-${ver%_${revision}} ]; then
rm -rf $XBPS_DESTDIR/${pkgname}-${ver%_${revision}}
if [ -d "$XBPS_DESTDIR/${pkgname}-${ver%_*}" ]; then
rm -rf "$XBPS_DESTDIR/${pkgname}-${ver%_*}"
fi
return $?
}