From c06d1e4d85e02e1ca0c87389d0f9f8b719c20c0b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 1 Jul 2014 11:04:34 +0200 Subject: [PATCH] xbps-src: partial revert of 871d2fa87. We can't pass XBPS_OPTIONS to xbps-uchroot(8) as is. --- common/xbps-src/shutils/chroot.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index 577327751a0..a42d509c180 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -177,7 +177,17 @@ chroot_handler() { if [ "$action" = "chroot" ]; then $CHROOT_CMD ${_chargs} $XBPS_MASTERDIR /bin/xbps-shell || rv=$? else - action="$XBPS_OPTIONS $action" + [ -n "$XBPS_CROSS_BUILD" ] && arg="$arg -a $XBPS_CROSS_BUILD" + [ -n "$XBPS_KEEP_ALL" ] && arg="$arg -C" + [ -n "$NOCOLORS" ] && arg="$arg -L" + [ -n "$XBPS_BUILD_FORCEMODE" ] && arg="$arg -f" + [ -n "$XBPS_MAKEJOBS" ] && arg="$arg -j$XBPS_MAKEJOBS" + [ -n "$XBPS_DEBUG_PKGS" ] && arg="$arg -g" + [ -n "$XBPS_SKIP_DEPS" ] && arg="$arg -I" + [ -n "$XBPS_ALT_REPOSITORY" ] && arg="$arg -r $XBPS_ALT_REPOSITORY" + [ -n "$XBPS_USE_GIT_REVS" ] && arg="$arg -G" + + action="$arg $action" env -i PATH=/bin:/sbin:/usr/bin:/usr/sbin:$PATH HOME=/tmp IN_CHROOT=1 LANG=en_US.UTF-8 \ $CHROOT_CMD ${_chargs} $XBPS_MASTERDIR /xbps-packages/xbps-src $action $pkg || rv=$? fi