From 5507688ce6226845fa75de88afeb7686e025df05 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 25 Apr 2019 14:11:37 +0200 Subject: [PATCH] legacy: more build script fixing --- legacy/build.sh | 13 ++----------- legacy/script/fullbuild | 2 ++ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/legacy/build.sh b/legacy/build.sh index 02a3e6f46..67013873f 100755 --- a/legacy/build.sh +++ b/legacy/build.sh @@ -5,20 +5,11 @@ cd "$(dirname $0)/.." BOOTLOADER_COMMIT=${1:-HEAD} FIRMWARE_COMMIT=${2:-HEAD} - -if [ "$BOOTLOADER_COMMIT" = "EMU" ]; then - export EMULATOR=1 -fi - -if [ "$EMULATOR" = 1 ]; then - IMAGE=trezor-mcu-emulator -else - IMAGE=trezor-mcu-build -fi +IMAGE=trezor-mcu-build USER=$(ls -lnd . | awk '{ print $3 }') GROUP=$(ls -lnd . | awk '{ print $4 }') -docker build -t "$IMAGE" --build-arg EMULATOR=$EMULATOR legacy +docker build -t "$IMAGE" . docker run -it -v $(pwd):/src:z --user="$USER:$GROUP" "$IMAGE" \ /src/legacy/script/fullbuild "$BOOTLOADER_COMMIT" "$FIRMWARE_COMMIT" diff --git a/legacy/script/fullbuild b/legacy/script/fullbuild index 8771a3129..bf887a962 100755 --- a/legacy/script/fullbuild +++ b/legacy/script/fullbuild @@ -11,6 +11,8 @@ set -eu cd "$(dirname "$0")/../.." +EMULATOR=${EMULATOR:-0} + readonly MCU_ROOT=legacy readonly ARTIFACT_EXTENSIONS=(bin elf)