mirror of
https://github.com/trezor/trezor-firmware.git
synced 2024-11-22 07:28:10 +00:00
build: cosmetic changes to travis and docker build
This commit is contained in:
parent
396a25401a
commit
2869d4cbcb
@ -33,16 +33,16 @@ before_install:
|
||||
|
||||
install:
|
||||
- pip3 install --user scons
|
||||
- pip3 install --user pyblake2
|
||||
- pip3 install --user flake8
|
||||
- pip3 install --user pytest
|
||||
- pip3 install --user ecdsa mnemonic protobuf requests
|
||||
- pip3 install --user git+https://github.com/trezor/python-trezor@master
|
||||
- pip3 install --user click pyblake2
|
||||
- pip3 install --user --no-deps git+https://github.com/trezor/python-trezor@master
|
||||
|
||||
before_script:
|
||||
- test "$GOAL" != "stm32" || wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2
|
||||
- test "$GOAL" != "stm32" || tar xfj gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2
|
||||
- test "$GOAL" != "stm32" || export PATH=$PATH:$PWD/gcc-arm-none-eabi-6-2017-q2-update/bin
|
||||
- test "$GOAL" != "stm32" || export PATH=$PWD/gcc-arm-none-eabi-6-2017-q2-update/bin:$PATH
|
||||
|
||||
script:
|
||||
- test "$GOAL" != "stm32" || make vendorheader
|
||||
|
12
Dockerfile
12
Dockerfile
@ -5,10 +5,18 @@ FROM debian:9
|
||||
# install build tools and dependencies
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
build-essential git python3-pip \
|
||||
gcc-arm-none-eabi libnewlib-arm-none-eabi \
|
||||
build-essential wget git python3-pip \
|
||||
gcc-multilib
|
||||
|
||||
# download and setup toolchain
|
||||
|
||||
ENV TOOLCHAIN_SHORTVER=6-2017q2
|
||||
ENV TOOLCHAIN_LONGVER=gcc-arm-none-eabi-6-2017-q2-update
|
||||
RUN cd /opt && wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/$TOOLCHAIN_SHORTVER/$TOOLCHAIN_LONGVER-linux.tar.bz2 && tar xfj $TOOLCHAIN_LONGVER-linux.tar.bz2
|
||||
ENV PATH=/opt/$TOOLCHAIN_LONGVER/bin:$PATH
|
||||
|
||||
# install python tools
|
||||
|
||||
RUN pip3 install click pyblake2 scons
|
||||
RUN pip3 install --no-deps git+https://github.com/trezor/python-trezor.git@master
|
||||
|
||||
|
@ -84,12 +84,12 @@ Not supported yet ...
|
||||
|
||||
For flashing firmware to blank device (without bootloader) use `make flash`,
|
||||
or `make flash STLINK_VER=v2-1` if using a ST-LINK/V2.1 interface.
|
||||
You need to have OpenOCD installed
|
||||
You need to have OpenOCD installed.
|
||||
|
||||
#### Debian/Ubuntu
|
||||
|
||||
```sh
|
||||
sudo pip3 install click pyblake2 scons
|
||||
sudo pip3 install --no-cache-dir click pyblake2 scons
|
||||
sudo pip3 install --no-deps git+https://github.com/trezor/python-trezor.git@master
|
||||
|
||||
sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
|
||||
|
@ -11,8 +11,4 @@ docker run -t -v $(pwd)/build-docker:/build:z $IMAGE /bin/sh -c "\
|
||||
ln -s /build build &&
|
||||
git checkout $TAG && \
|
||||
git submodule update --init --recursive && \
|
||||
make vendorheader && \
|
||||
make build_boardloader && \
|
||||
make build_bootloader && \
|
||||
make build_prodtest && \
|
||||
make build_firmware"
|
||||
make clean vendor vendorheader build_boardloader build_bootloader build_prodtest build_firmware"
|
||||
|
Loading…
Reference in New Issue
Block a user