From eca4ff7a04bc74d6632efdd6fa840dc4877bdc27 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 9 Apr 2021 11:12:58 +0200 Subject: [PATCH] make: make riotboot target depend on pkg-prepare When riotboot depends on a package for building that the main application also depends on (e.g., gecko_sdk for efm32), previously, that package would be checked out twice in parallel, which fails. This commit adds pkg-prepare as dependency to the bootloader target, ensuring any packages are already up-to-date before calling the bootloader submake. --- makefiles/boot/riotboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefiles/boot/riotboot.mk b/makefiles/boot/riotboot.mk index 2530c0089095..3288e2a7a667 100644 --- a/makefiles/boot/riotboot.mk +++ b/makefiles/boot/riotboot.mk @@ -76,7 +76,7 @@ riotboot: $(SLOT_RIOT_BINS) # riotboot bootloader compile target riotboot/flash-bootloader: riotboot/bootloader/flash -riotboot/bootloader/%: $(BUILDDEPS) +riotboot/bootloader/%: $(BUILDDEPS) pkg-prepare $(Q)/usr/bin/env -i \ QUIET=$(QUIET) PATH="$(PATH)"\ EXTERNAL_BOARD_DIRS="$(EXTERNAL_BOARD_DIRS)" BOARD=$(BOARD)\