From 1f54c61e41aff13f75923a4aca4f4aa9aa123f15 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 30 Mar 2016 23:14:17 +0200 Subject: [PATCH] Dockerfile fixes ported to 'next' --- radio/util/Dockerfile | 7 ++++++- radio/util/build.py | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/radio/util/Dockerfile b/radio/util/Dockerfile index aa4c1d4cb..88566c8f2 100644 --- a/radio/util/Dockerfile +++ b/radio/util/Dockerfile @@ -26,9 +26,14 @@ RUN wget -q https://launchpad.net/gcc-arm-embedded/4.7/4.7-2013-q3-update/+downl mv gcc-arm-none-eabi-4_7-2013q3 /opt/gcc-arm-none-eabi RUN wget -q http://ftp.de.debian.org/debian/pool/main/g/gcc-avr/gcc-avr_4.7.2-2_amd64.deb && \ + wget -q http://ftp.de.debian.org/debian/pool/main/a/avr-libc/avr-libc_1.8.0-2_all.deb && \ + wget -q http://ftp.de.debian.org/debian/pool/main/b/binutils-avr/binutils-avr_2.24+Atmel3.4.4-1_amd64.deb && \ wget -q http://ftp.de.debian.org/debian/pool/main/m/mpclib/libmpc2_0.9-4_amd64.deb && \ - dpkg -i gcc-avr_4.7.2-2_amd64.deb libmpc2_0.9-4_amd64.deb + dpkg -i gcc-avr_4.7.2-2_amd64.deb libmpc2_0.9-4_amd64.deb avr-libc_1.8.0-2_all.deb binutils-avr_2.24+Atmel3.4.4-1_amd64.deb VOLUME ["/opentx"] ENV PATH $PATH:/opt/gcc-arm-none-eabi/bin:/opentx/code/radio/util +ARG OPENTX_VERSION_SUFFIX= +ENV OPENTX_VERSION_SUFFIX ${OPENTX_VERSION_SUFFIX} + diff --git a/radio/util/build.py b/radio/util/build.py index 814755eab..1e7ff6bc5 100755 --- a/radio/util/build.py +++ b/radio/util/build.py @@ -139,6 +139,8 @@ elif what == "libsimulator": ext = ".so" target = "libopentx-" + options[optcount] + "-simulator.so" filename = "libopentx" +else: + exit(INVALID_BOARD) filename += "-" + options[optcount] optcount += 1 @@ -207,7 +209,7 @@ if not os.path.isfile(path): if what == "firmware": # Check binary size if board_family == BOARD_FAMILY_ARM: - size = os.stat(firmware).st_size + size = os.stat(target).st_size else: size = subprocess.check_output('avr-size -A %s | grep Total | cut -f2- -d " "' % target, shell=True) size = int(size.strip())