Skip to content

dist/tools/cosy: provide patch for PR #13 #18343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benpicco merged 1 commit into from
Jul 21, 2022
Merged

dist/tools/cosy: provide patch for PR #13 #18343

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions dist/tools/cosy/patches/0002-parse_elffile-fix-riot_base.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From ca34f5c4e808b9b6e61e1ceba5e7065bf71fe37a Mon Sep 17 00:00:00 2001
From: Jana Eisoldt <jana.eisoldt@st.ovgu.de>
Date: Mon, 21 Feb 2022 16:52:01 +0100
Subject: [PATCH] parse_elffile: fix riot_base

---
cosy.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cosy.py b/cosy.py
index b36c28a..2081f64 100755
--- a/cosy.py
+++ b/cosy.py
@@ -154,9 +154,9 @@ def parse_elffile(elffile, prefix, appdir, riot_base=None):
rbase = ["riotbuild/riotproject"]
if riot_base:
rbase.append(riot_base.strip("/"))
- else:
- rbase.append("RIOT")
- rbase.append("riotbuild/riotbase")
+
+ rbase.append("RIOT")
+ rbase.append("riotbuild/riotbase")
riot_base = "|".join([f'{p}/build|{p}' for p in rbase])

c = re.compile(r"(?P<addr>[0-9a-f]+) "