prepare 1.3.0 release

This commit is contained in:
Pavol Rusnak 2014-12-25 14:43:32 +01:00
parent 8660f67512
commit b06780e0a7
3 changed files with 7 additions and 14 deletions

View File

@ -8,7 +8,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FE324A81C208C89497E
# install build tools and dependencies # install build tools and dependencies
ENV GCC_ARM_VERSION 4-8-2014q2-0trusty10 ENV GCC_ARM_VERSION 4.9.3.2014q4-0trusty12
RUN apt-get install -y build-essential git gcc-arm-none-eabi=$GCC_ARM_VERSION python RUN apt-get install -y build-essential git gcc-arm-none-eabi=$GCC_ARM_VERSION python
# clone the source code # clone the source code
@ -17,10 +17,10 @@ RUN git clone https://github.com/libopencm3/libopencm3 && git clone https://gith
# build libopencm3 # build libopencm3
ENV LIBOPENCM3_GITREV f6b6d62ec5628ebb0602c466ee9fd7a6070ef1f0 ENV LIBOPENCM3_GITREV 8a15cec6bf99f59065879a14895fb8af8a8a53e7
RUN cd libopencm3 && git checkout $LIBOPENCM3_GITREV && make RUN cd libopencm3 && git checkout $LIBOPENCM3_GITREV && make
# build the firmware # build the firmware
ENV TREZOR_MCU_GITREV v1.2.1 ENV TREZOR_MCU_GITREV v1.3.0
RUN cd trezor-mcu && git checkout $TREZOR_MCU_GITREV && git submodule update --init && make && cd firmware && make RUN cd trezor-mcu && git checkout $TREZOR_MCU_GITREV && git submodule update --init && make && cd firmware && make

View File

@ -1,16 +1,9 @@
#!/bin/bash #!/bin/bash
dirname $0
IMAGETAG=trezor-mcu-build IMAGETAG=trezor-mcu-build
docker rmi $IMAGETAG || : docker rmi $IMAGETAG || :
docker build -t $IMAGETAG . docker build -t $IMAGETAG .
docker run -t -v $(pwd):/output $IMAGETAG /bin/cp /trezor-mcu/firmware/trezor.bin /output
CONTAINERTAG=trezor-mcu-build
docker rm $CONTAINERTAG || :
docker run --name $CONTAINERTAG $IMAGETAG true
docker cp $CONTAINERTAG:/trezor-mcu/firmware/trezor.bin .
echo "---------------------" echo "---------------------"
echo "Firmware fingerprint:" echo "Firmware fingerprint:"

View File

@ -21,8 +21,8 @@
#define __TREZOR_H__ #define __TREZOR_H__
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 2 #define VERSION_MINOR 3
#define VERSION_PATCH 1 #define VERSION_PATCH 0
#define STR(X) #X #define STR(X) #X
#define VERSTR(X) STR(X) #define VERSTR(X) STR(X)