From 9df85ff63e0d5e05dab5668c2037439a6e2f16b7 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 26 Nov 2019 08:52:09 +0100 Subject: [PATCH] travis: fix RTEMS compiler download logic --- travis/prepare.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/travis/prepare.sh b/travis/prepare.sh index 260f79f..0317a5a 100755 --- a/travis/prepare.sh +++ b/travis/prepare.sh @@ -135,9 +135,6 @@ EOF if [ -n "$RTEMS" ] then echo "Cross RTEMS${RTEMS} for pc386" - curl -L "https://github.com/mdavidsaver/rsb/releases/download/20171203-${RTEMS}/i386-rtems${RTEMS}-trusty-20171203-${RTEMS}.tar.bz2" \ - | tar -C / -xmj - sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' $EPICS_BASE/configure/os/CONFIG_SITE.Common.RTEMS cat << EOF >> $EPICS_BASE/configure/os/CONFIG_SITE.Common.RTEMS RTEMS_VERSION=$RTEMS @@ -152,6 +149,14 @@ else echo "EPICS Base will not be recompiled - compiler setup already done" fi +# Download RTEMS cross compiler +if [ -n "$RTEMS" ] +then + echo "Downloading RTEMS${RTEMS} cross compiler for pc386" + curl -L "https://github.com/mdavidsaver/rsb/releases/download/20171203-${RTEMS}/i386-rtems${RTEMS}-trusty-20171203-${RTEMS}.tar.bz2" \ + | tar -C / -xmj +fi + fold_end set.up.compiler # Build required dependencies