scripts: Minor improvement to feedback from travis-install.sh

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-07-10 10:37:58 -04:00
parent d4d8bf795b
commit ced5e35f0c
1 changed files with 3 additions and 2 deletions

View File

@ -15,7 +15,7 @@ mkdir -p ${BUILD_DIR} ${CACHE_DIR}
# Install embedded arm gcc # Install embedded arm gcc
###################################################################### ######################################################################
echo "=============== Install embedded arm gcc" echo -e "\n\n=============== Install embedded arm gcc\n\n"
GCC_ARM_URL="https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2017q4/gcc-arm-none-eabi-7-2017-q4-major-linux.tar.bz2" GCC_ARM_URL="https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2017q4/gcc-arm-none-eabi-7-2017-q4-major-linux.tar.bz2"
GCC_ARM_SHA="96a029e2ae130a1210eaa69e309ea40463028eab18ba19c1086e4c2dafe69a6a gcc-arm-none-eabi-7-2017-q4-major-linux.tar.bz2" GCC_ARM_SHA="96a029e2ae130a1210eaa69e309ea40463028eab18ba19c1086e4c2dafe69a6a gcc-arm-none-eabi-7-2017-q4-major-linux.tar.bz2"
GCC_ARM_FILE="$(basename ${GCC_ARM_URL})" GCC_ARM_FILE="$(basename ${GCC_ARM_URL})"
@ -37,6 +37,7 @@ tar xf "${CACHE_DIR}/${GCC_ARM_FILE}"
# Install (or build) pru gcc # Install (or build) pru gcc
###################################################################### ######################################################################
echo -e "\n\n=============== Install embedded pru gcc\n\n"
PRU_FILE=${CACHE_DIR}/gnupru.tar.gz PRU_FILE=${CACHE_DIR}/gnupru.tar.gz
PRU_DIR=${BUILD_DIR}/pru-gcc PRU_DIR=${BUILD_DIR}/pru-gcc
@ -59,7 +60,7 @@ fi
# Create python virtualenv environment # Create python virtualenv environment
###################################################################### ######################################################################
echo "=============== Install python virtualenv" echo -e "\n\n=============== Install python virtualenv\n\n"
cd ${MAIN_DIR} cd ${MAIN_DIR}
virtualenv ${BUILD_DIR}/python-env virtualenv ${BUILD_DIR}/python-env
${BUILD_DIR}/python-env/bin/pip install -r ${MAIN_DIR}/scripts/klippy-requirements.txt ${BUILD_DIR}/python-env/bin/pip install -r ${MAIN_DIR}/scripts/klippy-requirements.txt