Skip to content

Conversation

maribu
Copy link
Member

@maribu maribu commented Apr 25, 2023

Backport of #19506

Contribution description

The OPENOCD_CMD_RESET_HALT was not longer correctly passed to the script. This fixes the issue.

Testing procedure

Flashing of e.g. the cc2650-launchpad with upstream OpenOCD should work again.

Issues/PRs references

The change was added to #19050 after testing the PR and before merging. I'm not sure if the fix never worked because of this, or if behavior of target-export-variables or GNU Make changed.

The OPENOCD_CMD_RESET_HALT was not longer correctly passed to the
script. This fixes the issue.

(cherry picked from commit f220c23)
@maribu maribu added Area: build system Area: Build system Area: tools Area: Supplementary tools CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Process: release backport Integration Process: The PR is a release backport of a change previously provided to master Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) labels Apr 25, 2023
@riot-ci
Copy link

riot-ci commented Apr 25, 2023

Murdock results

✔️ PASSED

1efe8b3 tools/openocd: Fix handling of OPENOCD_CMD_RESET_HALT

Success Failures Total Runtime
6882 0 6882 10m:11s

Artifacts

@MrKevinWeiss
Copy link
Contributor

This should be merged into the release branch after the release is finished.

@MrKevinWeiss
Copy link
Contributor

Now that the release is done, bors merge

Copy link
Contributor

@MrKevinWeiss MrKevinWeiss left a comment

Choose a reason for hiding this comment

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

ack

@maribu
Copy link
Member Author

maribu commented Apr 28, 2023

bors merge

@bors
Copy link
Contributor

bors bot commented Apr 28, 2023

Build succeeded:

@bors bors bot merged commit f10a5b4 into RIOT-OS:2023.04-branch Apr 28, 2023
@maribu maribu deleted the backport/2023.04/makefiles/tools/openocd.inc.mk branch April 23, 2024 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: build system Area: Build system Area: tools Area: Supplementary tools CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Process: release backport Integration Process: The PR is a release backport of a change previously provided to master Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants