CreatBot/CreatBotKlipper
CreatBot/CreatBotKlipper
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci-install: Use prebuilt pru gcc binaries

Browse Source 
Don't build the pru binaries directly in the build test cases, instead
use the upstream binaries provided.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2025-04-07 14:07:47 -04:00
parent 4b9cb36247
commit 5493bdfb48
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/ci-build.sh
View File

@ -7,7 +7,7 @@ set -eu
# Paths to tools installed by ci-install.sh # Paths to tools installed by ci-install.sh
MAIN_DIR=${PWD} MAIN_DIR=${PWD}
BUILD_DIR=${PWD}/ci_build BUILD_DIR=${PWD}/ci_build
export PATH=${BUILD_DIR}/pru-gcc/bin:${PATH} export PATH=${BUILD_DIR}/pru-elf/bin:${PATH}
export PATH=${BUILD_DIR}/or1k-linux-musl-cross/bin:${PATH} export PATH=${BUILD_DIR}/or1k-linux-musl-cross/bin:${PATH}
PYTHON=${BUILD_DIR}/python-env/bin/python PYTHON=${BUILD_DIR}/python-env/bin/python
PYTHON2=${BUILD_DIR}/python2-env/bin/python PYTHON2=${BUILD_DIR}/python2-env/bin/python

30
scripts/ci-install.sh
View File

@ -19,34 +19,24 @@ echo -e "\n\n=============== Install system dependencies\n\n"
PKGS="virtualenv python2-dev libffi-dev build-essential" PKGS="virtualenv python2-dev libffi-dev build-essential"
PKGS="${PKGS} gcc-avr avr-libc" PKGS="${PKGS} gcc-avr avr-libc"
PKGS="${PKGS} libnewlib-arm-none-eabi gcc-arm-none-eabi binutils-arm-none-eabi" PKGS="${PKGS} libnewlib-arm-none-eabi gcc-arm-none-eabi binutils-arm-none-eabi"
PKGS="${PKGS} pv libmpfr-dev libgmp-dev libmpc-dev texinfo bison flex"
sudo apt-get update sudo apt-get update
sudo apt-get install ${PKGS} sudo apt-get install ${PKGS}
###################################################################### ######################################################################
# Install (or build) pru gcc # Install pru gcc
###################################################################### ######################################################################
echo -e "\n\n=============== Install embedded pru gcc\n\n" echo -e "\n\n=============== Install embedded pru gcc\n\n"
PRU_FILE=${CACHE_DIR}/gnupru.tar.gz PRU_ARCHIVE="pru-elf-2024.05.amd64.tar.xz"
PRU_DIR=${BUILD_DIR}/pru-gcc PRU_URL="https://github.com/dinuxbg/gnupru/releases/download/2024.05/${PRU_ARCHIVE}"
if [ ! -f ${PRU_FILE} ]; then if [ ! -f ${CACHE_DIR}/${PRU_ARCHIVE} ]; then
cd ${BUILD_DIR} wget "${PRU_URL}" -O "${CACHE_DIR}/${PRU_ARCHIVE}"
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
git clone https://github.com/dinuxbg/gnupru -b 2024.05 --depth 1
cd gnupru
export PREFIX=${PRU_DIR}
./download-and-prepare.sh 2>&1 | pv -nli 30 > ${BUILD_DIR}/gnupru-build.log
./build.sh 2>&1 | pv -nli 30 >> ${BUILD_DIR}/gnupru-build.log
cd ${BUILD_DIR}
tar cfz ${PRU_FILE} pru-gcc/
else
cd ${BUILD_DIR}
tar xfz ${PRU_FILE}
fi fi
cd ${BUILD_DIR}
tar xJf ${CACHE_DIR}/${PRU_ARCHIVE}
###################################################################### ######################################################################
# Install or1k-linux-musl toolchain # Install or1k-linux-musl toolchain
@ -59,10 +49,12 @@ GCC_VERSION=10
TOOLCHAIN_ZIP_V=${TOOLCHAIN}-${GCC_VERSION}.tgz TOOLCHAIN_ZIP_V=${TOOLCHAIN}-${GCC_VERSION}.tgz
URL=https://more.musl.cc/${GCC_VERSION}/x86_64-linux-musl/ URL=https://more.musl.cc/${GCC_VERSION}/x86_64-linux-musl/
if [ ! -f ${CACHE_DIR}/${TOOLCHAIN_ZIP_V} ]; then if [ ! -f ${CACHE_DIR}/${TOOLCHAIN_ZIP_V} ]; then
curl ${URL}/${TOOLCHAIN_ZIP} -o ${CACHE_DIR}/${TOOLCHAIN_ZIP_V} wget "${URL}/${TOOLCHAIN_ZIP}" -O "${CACHE_DIR}/${TOOLCHAIN_ZIP_V}"
fi fi
cd ${BUILD_DIR} cd ${BUILD_DIR}
tar xf ${CACHE_DIR}/${TOOLCHAIN_ZIP_V} tar xf ${CACHE_DIR}/${TOOLCHAIN_ZIP_V}
###################################################################### ######################################################################
# Create python3 virtualenv environment # Create python3 virtualenv environment
###################################################################### ######################################################################