Revert "chroot.sh: force install glibc and libxcrypt-compat to rebuild"
This reverts 9fe1dba9c71aa9b0d088a6bd68f58273035b9b42 The issue was resolved in e255843fd168248697e10b30729fb3c6393f3aa8
This commit is contained in:
parent
d52e080941
commit
df7a75346e
@ -14,15 +14,7 @@ install_base_chroot() {
|
||||
_bootstrap_arch="env XBPS_TARGET_ARCH=$XBPS_TARGET_PKG"
|
||||
fi
|
||||
(export XBPS_MACHINE=$XBPS_TARGET_PKG XBPS_ARCH=$XBPS_TARGET_PKG; chroot_sync_repodata)
|
||||
# Fix cyclic between glibc and libxcrypt-compat
|
||||
case "$XBPS_MACHINE" in
|
||||
*-musl)
|
||||
${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot
|
||||
;;
|
||||
*)
|
||||
${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot glibc libxcrypt-compat
|
||||
;;
|
||||
esac
|
||||
${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot
|
||||
if [ $? -ne 0 ]; then
|
||||
msg_error "xbps-src: failed to install base-chroot!\n"
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user