diff --git a/.travis.yml b/.travis.yml index b49a2d7f..eadbf5a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ services: - docker env: global: - - DOCKER="sfalexrog/img-tool:qemu-aarch64" + - DOCKER="sfalexrog/img-tool:qemu-update" - TARGET_REPO="https://github.com/${TRAVIS_REPO_SLUG}.git" - IMAGE_VERSION=${TRAVIS_TAG:-${TRAVIS_COMMIT:0:7}} - IMAGE_NAME="$(basename -s '.git' ${TARGET_REPO})_${IMAGE_VERSION}.img" diff --git a/builder/image-build.sh b/builder/image-build.sh index bfc25893..23061ab8 100755 --- a/builder/image-build.sh +++ b/builder/image-build.sh @@ -15,7 +15,7 @@ set -e # Exit immidiately on non-zero result -SOURCE_IMAGE="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2020-08-24/2020-08-20-raspios-buster-arm64-lite.zip" +SOURCE_IMAGE="https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2021-01-12/2021-01-11-raspios-buster-armhf-lite.zip" export DEBIAN_FRONTEND=${DEBIAN_FRONTEND:='noninteractive'} export LANG=${LANG:='C.UTF-8'} diff --git a/builder/image-ros.sh b/builder/image-ros.sh index 53a0a1fc..e56bc43c 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -91,7 +91,7 @@ apt install -y --no-install-recommends \ ros-${ROS_DISTRO}-compressed-image-transport=1.14.0-0buster \ ros-${ROS_DISTRO}-cv-bridge=1.15.0-0buster \ ros-${ROS_DISTRO}-cv-camera=0.5.0-0buster \ -ros-${ROS_DISTRO}-image-publisher=1.15.2-0buster \ +ros-${ROS_DISTRO}-image-publisher=1.15.3-0buster \ ros-${ROS_DISTRO}-web-video-server=0.2.1-0buster apt-mark hold \ ros-${ROS_DISTRO}-compressed-image-transport \ diff --git a/builder/image-software.sh b/builder/image-software.sh index b247f075..5499f510 100755 --- a/builder/image-software.sh +++ b/builder/image-software.sh @@ -70,9 +70,8 @@ apt-get update \ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 echo "deb http://packages.ros.org/ros/ubuntu buster main" > /etc/apt/sources.list.d/ros-latest.list -echo "deb http://deb.coex.tech/opencv4 buster main" > /etc/apt/sources.list.d/opencv3.list -echo "deb http://deb.coex.tech/ros buster main" > /etc/apt/sources.list.d/rpi-ros-melodic.list -echo "deb http://deb.coex.tech/clover buster main" > /etc/apt/sources.list.d/clover.list +wget -O - 'http://packages.coex.tech/key.asc' | sudo apt-key add - +echo 'deb http://packages.coex.tech buster main' | sudo tee -a /etc/apt/sources.list echo_stamp "Update apt cache" @@ -149,11 +148,11 @@ systemctl enable monkey.service echo_stamp "Install Node.js" cd /home/pi -wget https://nodejs.org/dist/v10.15.0/node-v10.15.0-linux-arm64.tar.gz -tar -xzf node-v10.15.0-linux-arm64.tar.gz -cp -R node-v10.15.0-linux-arm64/* /usr/local/ -rm -rf node-v10.15.0-linux-arm64/ -rm node-v10.15.0-linux-arm64.tar.gz +wget https://nodejs.org/dist/v10.15.0/node-v10.15.0-linux-armv7l.tar.gz +tar -xzf node-v10.15.0-linux-arm64.tar.gz tar -xzf node-v10.15.0-linux-armv7l.tar.gz +cp -R node-v10.15.0-linux-arm64/* /usr/local/ cp -R node-v10.15.0-linux-armv7l/* /usr/local/ +rm -rf node-v10.15.0-linux-arm64/ rm -rf node-v10.15.0-linux-armv7l +rm node-v10.15.0-linux-arm64.tar.gz rm node-v10.15.0-linux-armv7l.tar.gz echo_stamp "Installing ptvsd" my_travis_retry pip install ptvsd