teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xbps-src: misc tweaks for zap and use void-packages too in chroot ops.

This commit is contained in:
Juan RP 2014-10-11 11:02:57 +02:00
parent d9ff56e873
commit 77d1837155
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/xbps-src/shutils/chroot.sh
View File

@ -167,10 +167,9 @@ chroot_handler() {
if [ -n "$XBPS_HOSTDIR" ]; then
_chargs+=" -H $XBPS_HOSTDIR"
fi
if [ ! -d $XBPS_MASTERDIR/xbps-packages ]; then
mkdir -p $XBPS_MASTERDIR/xbps-packages
if [ ! -d $XBPS_MASTERDIR/void-packages ]; then
mkdir -p $XBPS_MASTERDIR/void-packages
fi
ln -sf xbps-packages $XBPS_MASTERDIR/void-packages
_chargs+=" -D ${XBPS_DISTDIR}"
[ -z "$action" -a -z "$pkg" ] && return 1

3
xbps-src
View File

@ -264,7 +264,8 @@ install_bbootstrap() {
masterdir_zap() {
for f in bin boot builddir destdir dev etc home lib lib32 lib64 mnt \
opt proc root run sbin sys tmp usr var xbps .xbps_chroot_init; do
opt proc root run sbin sys tmp usr var host media xbps \
xbps-packages void-packages .xbps_chroot_init; do
if [ -d "$XBPS_MASTERDIR/$f" ]; then
echo "Removing directory $XBPS_MASTERDIR/$f ..."
rm -rf $XBPS_MASTERDIR/$f