update buildpush script to comply to latest locations for prebuild artefacts

This commit is contained in:
bunnie 2021-06-11 16:54:19 +08:00
parent 77cd652a0e
commit adde48bc2d

View file

@ -13,8 +13,7 @@ CSR_CSV=
USE_IDENTITY=0 USE_IDENTITY=0
USE_NIGHTLY= USE_NIGHTLY=
IMAGE=hw-image IMAGE=hw-image
SOC_SVD=../betrusted-soc/build/software/soc.svd SOC_SVD=precursors/soc.svd
OVERRIDE_SVD=
POSITIONAL=() POSITIONAL=()
while [[ $# -gt 0 ]] while [[ $# -gt 0 ]]
@ -69,10 +68,6 @@ do
IMAGE=av-test IMAGE=av-test
shift shift
;; ;;
-p|--prebuild)
OVERRIDE_SVD=precursors/soc.svd
shift
;;
--image) --image)
IMAGE=$2 IMAGE=$2
shift shift
@ -101,15 +96,7 @@ DESTDIR=code/precursors
# full rebuild, and not just an incremental rebuild. :-/ # full rebuild, and not just an incremental rebuild. :-/
#touch services/log-server/src/main.rs # bump the build time in the log server #touch services/log-server/src/main.rs # bump the build time in the log server
if [ -z "$OVERRIDE_SVD" ] cargo $USE_NIGHTLY xtask $IMAGE $SOC_SVD
then
cargo $USE_NIGHTLY xtask $IMAGE $SOC_SVD
# only copy if changed, othrewise it seems to trigger extra build effort...
rsync -a --no-times --checksum $SOC_SVD svd2utra/examples/soc.svd
rsync -a --no-times --checksum $SOC_SVD emulation/soc/renode.svd
else
cargo $USE_NIGHTLY xtask $IMAGE $OVERRIDE_SVD
fi
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then