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

xbps-src: requires xbps>=0.45 now.

Browse source
This commit is contained in:
Juan RP 2015-06-03 11:32:25 +02:00
parent 1fd57abaad
commit 3493f3c229
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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 $@

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

@ -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 $@

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

@ -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

2
xbps-src
View file

@ -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)