[riot-notifications] [RIOT-OS/RIOT] tests/riotboot: use FLASHFILE for the generated file (#11089)

Gaƫtan Harter notifications at github.com
Fri Mar 1 17:52:17 CET 2019


### Contribution description

FLASHFILE is now a generated file when doing `make all`.
This prepares also for when flashers will use `FLASHFILE` as a file to
be flashed.

It currently still needs the hack below for openocd and edbg.

This also fixes the issue when building 'riotboot' in docker that was
being built with the host toolchain.

### Description

This pull request is big and needs to modify many files to work. I could split if requested.

### Testing procedure

#### Murdock change:

Murdock keeps running tests on `samr21-xpro`, and also runs the `tests/riotboot` test on `samr21-xpro`.

#### Riotboot global change

Review the code difference, the main thing is that now we can do `FLASHFILE = $(RIOTBOOT_COMBINED_BIN)` before parsing `$(RIOTBASE)/Makefile.include`

When compiling it should compile without ever saying `Circular dependency`.

My testing procedure is the following to ensure the firmware is indeed flashed and not relying on the previous version:

```
git clean -xdf tests/riotboot; BOARD=samr21-xpro make -C examples/hello-world/ flash; make -C tests/riotboot flash test
```
The test should succeed

#### Building `riotboot` in docker

This change also now has the consequence that when doing `BUILD_IN_DOCKER=1 make all` riotboot is correctly build in docker.

```
git clean -xdf tests/riotboot; DOCKER="sudo docker" BUILD_IN_DOCKER=1 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin make -C tests/riotboot flash test
```

### Issues/PRs references

This is part of https://github.com/RIOT-OS/RIOT/pull/8838
This replaces part of https://github.com/RIOT-OS/RIOT/pull/11083
You can view, comment on, or merge this pull request online at:

  https://github.com/RIOT-OS/RIOT/pull/11089

-- Commit Summary --

  * tests/riotboot: use 'RIOTBOOT_COMBINED_BIN' variable
  * makefiles/murdock.inc.mk: do not overwrite FLASHFILE if set
  * Makefile.include: include 'riotboot.mk' before using FLASHFILE
  * makefiles/riotboot.mk: slots only need to depend on BASELIBS
  * tests/riotboot: use FLASHFILE for the generated file

-- File Changes --

    M Makefile.include (11)
    M makefiles/boot/riotboot.mk (3)
    M makefiles/murdock.inc.mk (4)
    M tests/riotboot/Makefile (14)

-- Patch Links --

https://github.com/RIOT-OS/RIOT/pull/11089.patch
https://github.com/RIOT-OS/RIOT/pull/11089.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/RIOT-OS/RIOT/pull/11089
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.riot-os.org/pipermail/notifications/attachments/20190301/032c9550/attachment.html>


More information about the notifications mailing list