Browse Source

common/travis: remove need for -C flag for xbps-src

pull/2347/head
John 3 years ago
committed by Enno Boland
parent
commit
05099ab0e0
  1. 4
      .travis.yml
  2. 2
      common/travis/build.sh
  3. 6
      common/travis/show_files.sh

4
.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:

2
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

6
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

Loading…
Cancel
Save