diff --git a/Dockerfile b/Dockerfile index e77b0acd2d..db72b88ae7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN echo "deb http://ppa.launchpad.net/terry.guo/gcc-arm-embedded/ubuntu trusty # install build tools and dependencies -ENV GCC_ARM_VERSION 4.9.3.2014q4-0trusty12 +ENV GCC_ARM_VERSION 4.9.3.2015q1-0trusty13 RUN apt-get install -y build-essential git gcc-arm-none-eabi=$GCC_ARM_VERSION python # clone the source code @@ -19,5 +19,5 @@ RUN git clone https://github.com/libopencm3/libopencm3 # build libopencm3 -ENV LIBOPENCM3_GITREV 8a15cec6bf99f59065879a14895fb8af8a8a53e7 +ENV LIBOPENCM3_GITREV fd141a81313876e3dc9253d682f7314fa2a59718 RUN cd libopencm3 && git checkout $LIBOPENCM3_GITREV && make diff --git a/README.rst b/README.rst index c12aa8303e..5b0929dcc7 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ How to build Trezor firmware? 1. Install Docker (from docker.com or from your distribution repositories) 2. ``git clone https://github.com/trezor/trezor-mcu.git`` 3. ``cd trezor-mcu`` -4. ``./firmware-docker-build.sh`` +4. ``./firmware-docker-build.sh TAG`` (where TAG is v1.3.2 for example, if left blank the script builds latest commit) This creates trezor.bin in current directory and prints its fingerprint at the last line of the build log. @@ -21,6 +21,6 @@ How to get fingerprint of firmware signed and distributed by SatoshiLabs? 3. ``xxd -r -p trezor.signed.bin.hex trezor.signed.bin`` 4. ``./firmware-fingerprint.sh trezor.signed.bin`` -Step 4 should produce the same sha256 fingerprint like your local build. +Step 4 should produce the same sha256 fingerprint like your local build (for the same version tag). The reasoning for ``firmware-fingerprint.sh`` script is that signed firmware has special header holding signatures themselves, which must be avoided while calculating the fingerprint. diff --git a/firmware/trezor.h b/firmware/trezor.h index 0a368c6627..1664edd343 100644 --- a/firmware/trezor.h +++ b/firmware/trezor.h @@ -22,7 +22,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 -#define VERSION_PATCH 1 +#define VERSION_PATCH 2 #define STR(X) #X #define VERSTR(X) STR(X) diff --git a/trezor-crypto b/trezor-crypto index e37ba822e6..d4df66a8d0 160000 --- a/trezor-crypto +++ b/trezor-crypto @@ -1 +1 @@ -Subproject commit e37ba822e627550a453a1678d180f7e056b3d98f +Subproject commit d4df66a8d05886999fcaac0671119f153bcb49e8