riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make: make riotboot target depend on pkg-prepare

Browse Source 
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.
This commit is contained in:
Kaspar Schleiser 2021-04-09 11:12:58 +02:00
parent 6ce9db6df8
commit eca4ff7a04
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefiles/boot/riotboot.mk
View File

@ -76,7 +76,7 @@ riotboot: $(SLOT_RIOT_BINS)
# riotboot bootloader compile target # riotboot bootloader compile target
riotboot/flash-bootloader: riotboot/bootloader/flash riotboot/flash-bootloader: riotboot/bootloader/flash
riotboot/bootloader/%: $(BUILDDEPS) riotboot/bootloader/%: $(BUILDDEPS) pkg-prepare
$(Q)/usr/bin/env -i \ $(Q)/usr/bin/env -i \
QUIET=$(QUIET) PATH="$(PATH)"\ QUIET=$(QUIET) PATH="$(PATH)"\
EXTERNAL_BOARD_DIRS="$(EXTERNAL_BOARD_DIRS)" BOARD=$(BOARD)\ EXTERNAL_BOARD_DIRS="$(EXTERNAL_BOARD_DIRS)" BOARD=$(BOARD)\