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

Revert "xbps-src: fix uchroot chroot-style to not overwrite XBPS_CHROOT_CMD_ARGS."

Browse source 
This reverts commit ba4bba2031.
This commit is contained in:
Juan RP 2015-12-12 10:12:33 +01:00
parent ba4bba2031
commit 0a58fd0c01
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/chroot-style/uchroot.sh
View file

@ -2,13 +2,10 @@
# #
# This chroot script uses xbps-uchroot(8). # This chroot script uses xbps-uchroot(8).
# #
if [ -n "$XBPS_TEMP_MASTERDIR" ]; then
ARGS="-O"
fi
readonly MASTERDIR="$1" readonly MASTERDIR="$1"
readonly DISTDIR="$2" readonly DISTDIR="$2"
readonly HOSTDIR="$3" readonly HOSTDIR="$3"
readonly EXTRA_ARGS="$ARGS $4" readonly EXTRA_ARGS="$4"
readonly CMD="$5" readonly CMD="$5"
shift 5 shift 5

9
xbps-src
View file

@ -570,6 +570,15 @@ for i in REPOSITORY DESTDIR BUILDDIR SRCDISTDIR; do
unset val unset val
done done
# A temporary masterdir requires xbps-uchroot(8) and -O to use overlayfs
# on tmpfs (available with xbps-0.45).
if [ -z "$IN_CHROOT" -a -n "$XBPS_TEMP_MASTERDIR" ]; then
if [ "$XBPS_CHROOT_CMD" != "uchroot" ]; then
echo "ERROR: -t requires XBPS_CHROOT_CMD=uchroot, exiting..."
exit 1
fi
export XBPS_CHROOT_CMD_ARGS="-O"
fi
# #
# Sanitize PATH. # Sanitize PATH.
# #