diff --git a/.travis.yml b/.travis.yml index a17e00d512c..2158be8ef8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,9 @@ env: - ARCH=x86_64 BOOTSTRAP=x86_64 - ARCH=i686 BOOTSTRAP=i686 - ARCH=aarch64 BOOTSTRAP=x86_64 - - ARCH=armv7hf BOOTSTRAP=x86_64 + - ARCH=armv7l BOOTSTRAP=x86_64 - ARCH=x86_64-musl BOOTSTRAP=x86_64-musl - - ARCH=armv6hf-musl BOOTSTRAP=x86_64-musl + - ARCH=armv6l-musl BOOTSTRAP=x86_64-musl - ARCH=aarch64-musl BOOTSTRAP=x86_64-musl before_script: diff --git a/common/travis/build.sh b/common/travis/build.sh index 782e2facd7e..bf5b437367e 100755 --- a/common/travis/build.sh +++ b/common/travis/build.sh @@ -11,7 +11,7 @@ fi PKGS=$(./xbps-src sort-dependencies $(cat /tmp/templates)) for pkg in ${PKGS}; do - ./xbps-src -H $HOME/hostdir $arch -C pkg "$pkg" + ./xbps-src -H $HOME/hostdir $arch pkg "$pkg" [ $? -eq 1 ] && exit 1 done diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh index 89f0c2104c1..fcc99a6ae28 100755 --- a/common/travis/show_files.sh +++ b/common/travis/show_files.sh @@ -4,14 +4,12 @@ [ "$XLINT" ] && exit 0 -if [ "$1" != "$2" ]; then - arch="-a $2" -fi +export XBPS_TARGET_ARCH="$2" for pkg in $(cat /tmp/templates); do for subpkg in $(xsubpkg $pkg); do /bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m" - ./xbps-src -H $HOME/hostdir $arch show-files "$subpkg" + xbps-query --repository=$HOME/hostdir/binpkgs -f "$subpkg" done done