Skip to content

Commit

Permalink
Travis chroot should emulate armv6l
Browse files Browse the repository at this point in the history
  • Loading branch information
pguyot committed Jul 14, 2019
1 parent 99a5c5b commit 86872c8
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ elif [ "${1:-}" == "upgrade" ]; then
fi
fi

if [ $travis_chroot -eq 0 -a "`uname -s -m`" != 'Linux armv6l' ]; then
if [ "`uname -s -m`" != 'Linux armv6l' ]; then
echo "Installation only planned on Raspberry Pi Zero, will cowardly exit"
exit 1
fi
Expand Down Expand Up @@ -95,15 +95,7 @@ if [ ! -d "venv" ]; then
fi

echo "Installing PyPi requirements"
if [ $travis_chroot -eq 1 ]; then
# Travis code is run with qemu which is configured for emulating an armv7l
# But we really want armv6l precompiled binaries in requirements.txt
sed -i.travis -e 's|armv6l|armv7l|g' requirements.txt
venv/bin/pip install -r requirements.txt.travis
rm requirements.txt.travis
else
venv/bin/pip install -r requirements.txt
fi
venv/bin/pip install -r requirements.txt

if [ $makerfaire2018 -eq 0 ]; then
# maker faire card has no mic, no need to install snips
Expand Down

0 comments on commit 86872c8

Please sign in to comment.