From b06780e0a7c0cb99b054e166109666d8af8bd618 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Thu, 25 Dec 2014 14:43:32 +0100
Subject: [PATCH] prepare 1.3.0 release

---
 Dockerfile               |  6 +++---
 firmware-docker-build.sh | 11 ++---------
 firmware/trezor.h        |  4 ++--
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 81c4cf8..57509c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FE324A81C208C89497E
 
 # 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
 
 # clone the source code
@@ -17,10 +17,10 @@ RUN git clone https://github.com/libopencm3/libopencm3 && git clone https://gith
 
 # build libopencm3
 
-ENV LIBOPENCM3_GITREV f6b6d62ec5628ebb0602c466ee9fd7a6070ef1f0
+ENV LIBOPENCM3_GITREV 8a15cec6bf99f59065879a14895fb8af8a8a53e7
 RUN cd libopencm3 && git checkout $LIBOPENCM3_GITREV && make
 
 # 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
diff --git a/firmware-docker-build.sh b/firmware-docker-build.sh
index 3df89a8..21128d7 100755
--- a/firmware-docker-build.sh
+++ b/firmware-docker-build.sh
@@ -1,16 +1,9 @@
 #!/bin/bash
-
-dirname $0
-
 IMAGETAG=trezor-mcu-build
+
 docker rmi $IMAGETAG || :
 docker build -t $IMAGETAG .
-
-CONTAINERTAG=trezor-mcu-build
-docker rm $CONTAINERTAG || :
-docker run --name $CONTAINERTAG $IMAGETAG true
-
-docker cp $CONTAINERTAG:/trezor-mcu/firmware/trezor.bin .
+docker run -t -v $(pwd):/output $IMAGETAG /bin/cp /trezor-mcu/firmware/trezor.bin /output
 
 echo "---------------------"
 echo "Firmware fingerprint:"
diff --git a/firmware/trezor.h b/firmware/trezor.h
index 001b7a4..9ef2e81 100644
--- a/firmware/trezor.h
+++ b/firmware/trezor.h
@@ -21,8 +21,8 @@
 #define __TREZOR_H__
 
 #define VERSION_MAJOR 1
-#define VERSION_MINOR 2
-#define VERSION_PATCH 1
+#define VERSION_MINOR 3
+#define VERSION_PATCH 0
 
 #define STR(X) #X
 #define VERSTR(X) STR(X)