From 3493f3c2297aab595d30ea2871f1757ebd022c26 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jun 2015 11:32:25 +0200 Subject: [PATCH] xbps-src: requires xbps>=0.45 now. --- common/chroot-style/uchroot.sh | 2 +- common/chroot-style/uunshare.sh | 2 +- common/xbps-src/shutils/chroot.sh | 6 +++--- xbps-src | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/chroot-style/uchroot.sh b/common/chroot-style/uchroot.sh index 77ef4a4496..a5c0a3617e 100755 --- a/common/chroot-style/uchroot.sh +++ b/common/chroot-style/uchroot.sh @@ -17,4 +17,4 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then exit 1 fi -exec xbps-uchroot $EXTRA_ARGS -D $DISTDIR ${HOSTDIR:+-H $HOSTDIR} $MASTERDIR $@ +exec xbps-uchroot $EXTRA_ARGS -b $DISTDIR:/void-packages ${HOSTDIR:+-b $HOSTDIR:/host} $MASTERDIR $@ diff --git a/common/chroot-style/uunshare.sh b/common/chroot-style/uunshare.sh index 12056f58bd..fce811d7d0 100755 --- a/common/chroot-style/uunshare.sh +++ b/common/chroot-style/uunshare.sh @@ -17,4 +17,4 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then exit 1 fi -exec xbps-uunshare $EXTRA_ARGS -D $DISTDIR ${HOSTDIR:+-H $HOSTDIR} $MASTERDIR $@ +exec xbps-uunshare $EXTRA_ARGS -b $DISTDIR:/void-packages ${HOSTDIR:+-b $HOSTDIR:/host} $MASTERDIR $@ diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index 08db972837..67148a3146 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -147,7 +147,7 @@ chroot_sync_repos() { # Make sure to sync index for remote repositories. $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \ $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" \ - "$XBPS_CHROOT_CMD_ARGS" /usr/sbin/xbps-install -S + "$XBPS_CHROOT_CMD_ARGS" xbps-install -- -S fi if [ -n "$XBPS_CROSS_BUILD" ]; then @@ -160,7 +160,7 @@ chroot_sync_repos() { env XBPS_TARGET_ARCH=$XBPS_TARGET_ARCH \ $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \ $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \ - /usr/sbin/xbps-install -r $XBPS_CROSS_BASE -S + xbps-install -- -r $XBPS_CROSS_BASE -S 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 \ $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \ $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \ - /void-packages/xbps-src $action $pkg + /void-packages/xbps-src -- $action $pkg rv=$? fi diff --git a/xbps-src b/xbps-src index 4e15f8e60e..4957645d93 100755 --- a/xbps-src +++ b/xbps-src @@ -344,7 +344,7 @@ read_pkg() { setup_pkg $XBPS_TARGET_PKG $XBPS_CROSS_BUILD } -readonly XBPS_VERSION_REQ="0.44" +readonly XBPS_VERSION_REQ="0.45" readonly XBPS_VERSION=$(xbps-uhelper -V|awk '{print $2}') readonly XBPS_SRC_VERSION="113" export XBPS_MACHINE=$(xbps-uhelper arch)