dist/tools/usb-serial: call ttys.py with its path #19823
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maribu
approved these changes
Jul 12, 2023
|
bors merge |
|
🕐 Waiting for PR status (GitHub check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set. |
maribu
reviewed
Jul 13, 2023
dist/tools/usb-serial/find-tty.sh
Outdated
| @@ -7,7 +7,7 @@ | |||
| exit_code=1 | |||
|
|
|||
| for serial in "$@"; do | |||
| if ./ttys.py --format path --serial "$serial"; then | |||
| if ${RIOTTOOLS}/usb-serial/ttys.py --format path --serial "$serial"; then | |||
There was a problem hiding this comment.
Suggested change
| if ${RIOTTOOLS}/usb-serial/ttys.py --format path --serial "$serial"; then | |
| if "${RIOTTOOLS}/usb-serial/ttys.py" --format path --serial "$serial"; then |
Maybe we should also fall back RIOTTOOLS to . when not provided, so that ./find-tty.sh still works?
|
bors cancel |
|
How about this instead: diff --git a/dist/tools/usb-serial/find-tty.sh b/dist/tools/usb-serial/find-tty.sh
index 136513d3ef..4b020c3227 100755
--- a/dist/tools/usb-serial/find-tty.sh
+++ b/dist/tools/usb-serial/find-tty.sh
@@ -6,8 +6,10 @@
exit_code=1
+SCRIPTDIR="$(cd "$(dirname "$0")" || exit 1; pwd)"
+
for serial in "$@"; do
- if ./ttys.py --format path --serial "$serial"; then
+ if "$SCRIPTDIR"/ttys.py --format path --serial "$serial"; then
exit_code=0
fi
doneIt seems to fix #19805 for me and should hopefully also work when called manually, e.g. when |
Signed-off-by: Dylan Laduranty <dylan.laduranty@mesotic.com>
dylad
force-pushed
the
dist/tools/usb-serial/fix_find-tty
branch
from
f5a4625 to
1e800f3
Compare
|
I've applied @maribu patch to both |
Signed-off-by: Dylan Laduranty <dylan.laduranty@mesotic.com>
dylad
force-pushed
the
dist/tools/usb-serial/fix_find-tty
branch
from
1e800f3 to
1007f02
Compare
dylad
added
the
CI: ready for build
|
bors merge |
|
Build succeeded! The publicly hosted instance of bors-ng is deprecated and will go away soon. If you want to self-host your own instance, instructions are here. If you want to switch to GitHub's built-in merge queue, visit their help page.
|
|
Thanks @maribu |
This was referenced Jul 14, 2023
|
Backport provided in #19831 |
bors bot
added a commit
that referenced
this pull request
Jul 14, 2023
19831: dist/tools/usb-serial: call ttys.py with its path [backport 2023.07] r=benpicco a=maribu # Backport of #19823 ### Contribution description This PR provides a fix for #19805 When calling `SERIAL=xxx make flash` the command failed because the script `dist/tools/usb-serial/find-ttys.sh` tries to call `ttys.py` but it doesn't find it. So pass the full path to `ttys.py` to get rid of the problem. ### Testing procedure Connect at least two boards to your computer run `make list-ttys ` to get the ID of your boards Try to flash one of them with (replace SERIAL with the one you get with the previous command): `BOARD=xxx SERIAL=xxx make -C tests/leds flash` It fails on master. It should works with this PR. ### Issues/PRs references Fixes #19805 Co-authored-by: Dylan Laduranty <dylan.laduranty@mesotic.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Contribution description
This PR provides a fix for #19805
When calling
SERIAL=xxx make flashthe command failed because the scriptdist/tools/usb-serial/find-ttys.shtries to callttys.pybut it doesn't find it. So pass the full path tottys.pyto get rid of the problem.Testing procedure
Connect at least two boards to your computer
run
make list-ttysto get the ID of your boardsTry to flash one of them with (replace SERIAL with the one you get with the previous command):
BOARD=xxx SERIAL=xxx make -C tests/leds flashIt fails on master.
It should works with this PR.
Issues/PRs references
Fixes #19805