snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

xbps-src/chroot.sh: repair "binary-bootstrap" for 32bit on x86_64.

This commit is contained in:
Juan RP 2020-01-05 12:07:30 +01:00
parent 964144815b
commit 0ad1351c30
No known key found for this signature in database
GPG Key ID: AF19F6CB482F9368
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/xbps-src/shutils/chroot.sh
View File

@ -2,19 +2,18 @@
install_base_chroot() { install_base_chroot() {
[ "$CHROOT_READY" ] && return [ "$CHROOT_READY" ] && return
chroot_sync_repodata
if [ "$1" = "bootstrap" ]; then if [ "$1" = "bootstrap" ]; then
unset XBPS_TARGET_PKG XBPS_INSTALL_ARGS unset XBPS_TARGET_PKG XBPS_INSTALL_ARGS
else else
XBPS_TARGET_PKG="$1" XBPS_TARGET_PKG="$1"
fi fi
[ "$XBPS_SKIP_REMOTEREPOS" ] && unset XBPS_INSTALL_ARGS
# binary bootstrap # binary bootstrap
msg_normal "xbps-src: installing base-chroot...\n" msg_normal "xbps-src: installing base-chroot...\n"
# XBPS_TARGET_PKG == arch # XBPS_TARGET_PKG == arch
if [ "$XBPS_TARGET_PKG" ]; then if [ "$XBPS_TARGET_PKG" ]; then
_bootstrap_arch="env XBPS_TARGET_ARCH=$XBPS_TARGET_PKG" _bootstrap_arch="env XBPS_TARGET_ARCH=$XBPS_TARGET_PKG"
fi fi
(export XBPS_MACHINE=$XBPS_TARGET_PKG XBPS_ARCH=$XBPS_TARGET_PKG; chroot_sync_repodata)
${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot ${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
msg_error "xbps-src: failed to install base-chroot!\n" msg_error "xbps-src: failed to install base-chroot!\n"