Skip to content

sys/riotboot: misc fixes#11803

Merged
fjmolinas merged 2 commits intoRIOT-OS:masterfrom
kaspar030:misc_riotboot_fixes
Jul 15, 2019
Merged

sys/riotboot: misc fixes#11803
fjmolinas merged 2 commits intoRIOT-OS:masterfrom
kaspar030:misc_riotboot_fixes

Conversation

@kaspar030
Copy link
Copy Markdown
Contributor

@kaspar030 kaspar030 commented Jul 5, 2019

Contribution description

This PR contains two fixes for the riotboot makefiles:

  1. ensure that the call to "date" that sets the epoch is not done multiple times due to Makefile's lazy evaluation
  2. add APP_VER to resulting binar filenames, so multiple versions can be created simultaneously.

This PR depends on "add_riotboot_test_script".

Testing procedure

  • ensure the RIOTBOOT test is still completing correctly

Issues/PRs references

Waiting for #11707 (automatic tests).
This is not really a dependency, but the same files are touched, and testing should be easier with a test application.

@kaspar030 kaspar030 added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Area: network Area: Networking Area: build system Area: Build system State: waiting for other PR State: The PR requires another PR to be merged first labels Jul 5, 2019
@kaspar030 kaspar030 requested review from aabadie and fjmolinas July 5, 2019 13:47
kaspar030 added a commit to kaspar030/RIOT that referenced this pull request Jul 8, 2019
@kaspar030
DEPENDENCY MERGE: misc_riotboot_fixes (RIOT-OS#11803)
3ec2666
@kaspar030 kaspar030 mentioned this pull request Jul 8, 2019
Merged
kaspar030 added a commit to kaspar030/RIOT that referenced this pull request Jul 10, 2019
@kaspar030
DEPENDENCY MERGE: misc_riotboot_fixes (RIOT-OS#11803)
c1ed1bc
kaspar030 added a commit to kaspar030/RIOT that referenced this pull request Jul 10, 2019
@kaspar030
DEPENDENCY MERGE: misc_riotboot_fixes (RIOT-OS#11803)
cd9847b
kaspar030 added a commit to kaspar030/RIOT that referenced this pull request Jul 12, 2019
@kaspar030
DEPENDENCY MERGE: misc_riotboot_fixes (RIOT-OS#11803)
87c33da
kaspar030 added a commit to kaspar030/RIOT that referenced this pull request Jul 12, 2019
@kaspar030
DEPENDENCY MERGE: misc_riotboot_fixes (RIOT-OS#11803)
8807e39
@kaspar030 kaspar030 force-pushed the misc_riotboot_fixes branch from 5a8dcad to 88a5d6b Compare July 15, 2019 08:34
@fjmolinas
Copy link
Copy Markdown
Contributor

fjmolinas commented Jul 15, 2019

@kaspar030 please rebase this one.

@kaspar030 kaspar030 removed the State: waiting for other PR State: The PR requires another PR to be merged first label Jul 15, 2019
@kaspar030 kaspar030 force-pushed the misc_riotboot_fixes branch from 88a5d6b to b4557ea Compare July 15, 2019 11:39
@kaspar030
Copy link
Copy Markdown
Contributor Author

kaspar030 commented Jul 15, 2019

@kaspar030 please rebase this one.

done!

@kaspar030 kaspar030 added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: run tests If set, CI server will run tests on hardware for the labeled PR labels Jul 15, 2019
fjmolinas
fjmolinas reviewed Jul 15, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@fjmolinas fjmolinas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, lets see the CI test output.

@fjmolinas fjmolinas added CI: disable test cache If set, CI will always run all tests regardless of whether they have been run successfully before CI: run tests If set, CI server will run tests on hardware for the labeled PR CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: run tests If set, CI server will run tests on hardware for the labeled PR CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Jul 15, 2019
fjmolinas
fjmolinas approved these changes Jul 15, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@fjmolinas fjmolinas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI is good, ACK!

@fjmolinas fjmolinas merged commit 9f20c8a into RIOT-OS:master Jul 15, 2019
@kaspar030 kaspar030 deleted the misc_riotboot_fixes branch July 15, 2019 13:14
@kb2ma kb2ma added this to the Release 2019.10 milestone Sep 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fjmolinas fjmolinas fjmolinas approved these changes

@aabadie aabadie Awaiting requested review from aabadie

Assignees

No one assigned

Labels

Area: build system Area: Build system Area: network Area: Networking CI: disable test cache If set, CI will always run all tests regardless of whether they have been run successfully before CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: run tests If set, CI server will run tests on hardware for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Milestone

Release 2019.10

Development

Successfully merging this pull request may close these issues.

3 participants

@kaspar030 @fjmolinas @kb2ma