common/travis: make check-install use clean 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.
This commit is contained in:
parent
d2567b3d56
commit
9df91d9a2b
1 changed files with 13 additions and 3 deletions
|
@ -6,20 +6,30 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
|
||||||
|
|
||||||
if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
|
if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
|
||||||
triplet="$(/hostrepo/xbps-src -a "$XBPS_TARGET_ARCH" show-var XBPS_CROSS_TRIPLET)"
|
triplet="$(/hostrepo/xbps-src -a "$XBPS_TARGET_ARCH" show-var XBPS_CROSS_TRIPLET)"
|
||||||
ROOTDIR="-r /usr/$triplet"
|
CONFDIR="-C /usr/$triplet/etc/xbps.d"
|
||||||
|
else
|
||||||
|
CONFDIR="-C /etc/xbps.d"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
mkdir /check-install
|
||||||
|
|
||||||
|
mkdir -p /check-install/var/db/xbps/keys
|
||||||
|
cp /var/db/xbps/keys/* /check-install/var/db/xbps/keys/
|
||||||
|
|
||||||
ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
|
ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
|
||||||
--repository=$HOME/hostdir/binpkgs
|
--repository=$HOME/hostdir/binpkgs
|
||||||
--repository=$HOME/hostdir/binpkgs/nonfree"
|
--repository=$HOME/hostdir/binpkgs/nonfree"
|
||||||
|
ROOTDIR="-r /check-install"
|
||||||
|
|
||||||
|
xbps-install $ROOTDIR $ADDREPO $CONFDIR -S
|
||||||
|
|
||||||
while read -r pkg; do
|
while read -r pkg; do
|
||||||
for subpkg in $(xsubpkg $pkg); do
|
for subpkg in $(xsubpkg $pkg); do
|
||||||
/bin/echo -e "\x1b[32mTrying to install dependants of $subpkg:\x1b[0m"
|
/bin/echo -e "\x1b[32mTrying to install dependants of $subpkg:\x1b[0m"
|
||||||
for dep in $(xbps-query $ADDREPO -RX "$subpkg"); do
|
for dep in $(xbps-query $ADDREPO -RX "$subpkg"); do
|
||||||
xbps-install \
|
xbps-install \
|
||||||
$ROOTDIR $ADDREPO \
|
$ROOTDIR $ADDREPO $CONFDIR \
|
||||||
-Sny \
|
-ny \
|
||||||
"$subpkg" "$(xbps-uhelper getpkgname "$dep")"
|
"$subpkg" "$(xbps-uhelper getpkgname "$dep")"
|
||||||
ret="$?"
|
ret="$?"
|
||||||
if [ "$ret" -eq 8 ] || [ "$ret" -eq 11 ]; then
|
if [ "$ret" -eq 8 ] || [ "$ret" -eq 11 ]; then
|
||||||
|
|
Loading…
Add table
Reference in a new issue