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

xbps-src: fix regression with the proot chroot-style.

Browse source
This commit is contained in:
Juan RP 2015-06-03 20:12:49 +02:00
parent 368ef50dac
commit 1ffba0ae71
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,8 @@ readonly MASTERDIR="$1"
readonly DISTDIR="$2" readonly DISTDIR="$2"
readonly HOSTDIR="$3" readonly HOSTDIR="$3"
readonly EXTRA_ARGS="$4" readonly EXTRA_ARGS="$4"
shift 4 readonly CMD="$5"
shift 5
if ! command -v xbps-uchroot >/dev/null 2>&1; then if ! command -v xbps-uchroot >/dev/null 2>&1; then
exit 1 exit 1
@ -17,4 +18,4 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then
exit 1 exit 1
fi fi
exec xbps-uchroot $EXTRA_ARGS -b $DISTDIR:/void-packages ${HOSTDIR:+-b $HOSTDIR:/host} $MASTERDIR $@ exec xbps-uchroot $EXTRA_ARGS -b $DISTDIR:/void-packages ${HOSTDIR:+-b $HOSTDIR:/host} $MASTERDIR $CMD -- $@

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

@ -6,7 +6,8 @@ readonly MASTERDIR="$1"
readonly DISTDIR="$2" readonly DISTDIR="$2"
readonly HOSTDIR="$3" readonly HOSTDIR="$3"
readonly EXTRA_ARGS="$4" readonly EXTRA_ARGS="$4"
shift 4 readonly CMD="$5"
shift 5
if ! command -v xbps-uunshare >/dev/null 2>&1; then if ! command -v xbps-uunshare >/dev/null 2>&1; then
exit 1 exit 1
@ -17,4 +18,4 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then
exit 1 exit 1
fi fi
exec xbps-uunshare $EXTRA_ARGS -b $DISTDIR:/void-packages ${HOSTDIR:+-b $HOSTDIR:/host} $MASTERDIR $@ exec xbps-uunshare $EXTRA_ARGS -b $DISTDIR:/void-packages ${HOSTDIR:+-b $HOSTDIR:/host} $MASTERDIR $CMD -- $@

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

@ -147,7 +147,7 @@ chroot_sync_repos() {
# Make sure to sync index for remote repositories. # Make sure to sync index for remote repositories.
$XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \ $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \
$XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" \ $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" \
"$XBPS_CHROOT_CMD_ARGS" xbps-install -- -S "$XBPS_CHROOT_CMD_ARGS" xbps-install -S
fi fi
if [ -n "$XBPS_CROSS_BUILD" ]; then if [ -n "$XBPS_CROSS_BUILD" ]; then
@ -160,7 +160,7 @@ chroot_sync_repos() {
env XBPS_TARGET_ARCH=$XBPS_TARGET_ARCH \ env XBPS_TARGET_ARCH=$XBPS_TARGET_ARCH \
$XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \ $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \
$XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \ $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \
xbps-install -- -r $XBPS_CROSS_BASE -S xbps-install -r $XBPS_CROSS_BASE -S
fi fi
fi fi
@ -209,7 +209,7 @@ chroot_handler() {
env -i PATH="/usr/bin:/usr/sbin:$PATH" HOME=/tmp IN_CHROOT=1 LANG=en_US.UTF-8 \ env -i PATH="/usr/bin:/usr/sbin:$PATH" HOME=/tmp IN_CHROOT=1 LANG=en_US.UTF-8 \
$XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \ $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \
$XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \ $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \
/void-packages/xbps-src -- $action $pkg /void-packages/xbps-src $action $pkg
rv=$? rv=$?
fi fi