From 24a54fe853b5360c757f6470a4c0b65803e12474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Thu, 28 Feb 2019 17:01:52 +0100 Subject: [PATCH] tests/mcuboot: handle building 'mcuboot' in docker When using BUILD_IN_DOCKER only make 'all' execute 'mcuboot' target when inside the container. Otherwise it will execute it using your host toolchain. This is a hack and could be prevented by having a file target put in FLASHFILE. This does currently not allow flashing after building in docker as flashing should be done with `mcuboot-flash` which will not be done in docker. It would require the `FLASHFILE` fix to be done properly. --- tests/mcuboot/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/mcuboot/Makefile b/tests/mcuboot/Makefile index 6ca889bed5..3fcbf4f06f 100644 --- a/tests/mcuboot/Makefile +++ b/tests/mcuboot/Makefile @@ -7,6 +7,9 @@ BOARD_WHITELIST := nrf52dk export IMAGE_VERSION = 1.1.1+1 # this test is supposed to always build the mcuboot image +ifneq ($(BUILD_IN_DOCKER),1) +# HACK: When building with docker, mcuboot target must be done only in docker all: mcuboot +endif include $(RIOTBASE)/Makefile.include