From df7a75346e6b3a5f4dd0a3a5af29c7a9bd9e9ff4 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 13 Mar 2024 19:42:24 -0700 Subject: [PATCH] Revert "chroot.sh: force install glibc and libxcrypt-compat to rebuild" This reverts 9fe1dba9c71aa9b0d088a6bd68f58273035b9b42 The issue was resolved in e255843fd168248697e10b30729fb3c6393f3aa8 --- common/xbps-src/shutils/chroot.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index fc17dae4fdb..69ca6b78f58 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -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