From ea99d9d518ec2c8ec08a11eacc59b792e5cb177c Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Thu, 6 Apr 2023 19:06:26 +0100 Subject: [PATCH] common/travis: make check-install use new rootdir. The CI has `base-chroot` installed, but sometimes this script would try to install `base-system,` causing conflicts. This commit fixes that issue by using a brand-new rootdir. --- common/travis/check-install.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh index 943a6bc6211c..5ecea84e640b 100755 --- a/common/travis/check-install.sh +++ b/common/travis/check-install.sh @@ -4,22 +4,19 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo -if [ "$1" != "$XBPS_TARGET_ARCH" ]; then - triplet="$(/hostrepo/xbps-src -a "$XBPS_TARGET_ARCH" show-var XBPS_CROSS_TRIPLET)" - ROOTDIR="-r /usr/$triplet" -fi - ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap --repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree" +mkdir /check-install + while read -r pkg; do for subpkg in $(xsubpkg $pkg); do /bin/echo -e "\x1b[32mTrying to install dependants of $subpkg:\x1b[0m" for dep in $(xbps-query $ADDREPO -RX "$subpkg"); do xbps-install \ - $ROOTDIR $ADDREPO \ - -Sny \ + $ADDREPO \ + -Sny -r /check-install \ "$subpkg" "$(xbps-uhelper getpkgname "$dep")" ret="$?" if [ "$ret" -eq 8 ] || [ "$ret" -eq 11 ]; then