mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2025-12-24 14:03:55 +01:00
tools: Use RIOT maintained cosy
This commit is contained in:
parent
e481058955
commit
4201f4f09f
4
dist/tools/cosy/Makefile
vendored
4
dist/tools/cosy/Makefile
vendored
@ -1,6 +1,6 @@
|
||||
PKG_NAME=cosy
|
||||
PKG_URL=https://github.com/haukepetersen/cosy.git
|
||||
PKG_VERSION=6131f489dda589c4c19068938f99fae679e97fb0
|
||||
PKG_URL=https://github.com/RIOT-OS/cosy/
|
||||
PKG_VERSION=087fb2d1f2e4d82c7df985e770011f703998aefa
|
||||
PKG_LICENSE=GPL-3
|
||||
|
||||
include $(RIOTBASE)/pkg/pkg.mk
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From 221c368153f2aaa73f2a474bb39f547835fdaa0d Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
|
||||
Date: Sat, 11 Jun 2022 14:39:16 +0200
|
||||
Subject: [PATCH] cosy: allow to specify port
|
||||
|
||||
---
|
||||
cosy.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cosy.py b/cosy.py
|
||||
index b36c28a..6fcb118 100755
|
||||
--- a/cosy.py
|
||||
+++ b/cosy.py
|
||||
@@ -28,7 +28,6 @@ import json
|
||||
import frontend_server
|
||||
|
||||
ROOT = path.join(Path(path.abspath(__file__)).parent, "root")
|
||||
-PORT = 12345
|
||||
|
||||
|
||||
def add_sym(target, sym):
|
||||
@@ -352,6 +351,7 @@ if __name__ == "__main__":
|
||||
p.add_argument("-c", type=argparse.FileType('w'),
|
||||
help="Write module sizes to cvs file")
|
||||
p.add_argument("-d", action="store_true", help="Don't run as web server")
|
||||
+ p.add_argument("--port", default="12345", help="Webserver port", type=int)
|
||||
args = p.parse_args()
|
||||
|
||||
# extract path to elf and map file
|
||||
@@ -407,4 +407,4 @@ if __name__ == "__main__":
|
||||
print(subprocess.check_output((args.p + 'size', elffile)).decode("utf-8"))
|
||||
|
||||
if not args.d:
|
||||
- frontend_server.run(ROOT, PORT, 'index.html')
|
||||
+ frontend_server.run(ROOT, args.port, 'index.html')
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
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]+) "
|
||||
@ -1,34 +0,0 @@
|
||||
From 40e6dfb3ba9c50d0bac3931b981822aaa20375a6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mikolai=20G=C3=BCtschow?= <mikolai.guetschow@tu-dresden.de>
|
||||
Date: Tue, 16 Jul 2024 16:48:49 +0200
|
||||
Subject: [PATCH] take BUILD_DIR environment variable into account
|
||||
|
||||
---
|
||||
cosy.py | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cosy.py b/cosy.py
|
||||
index 7a15cc5..5d66f6b 100755
|
||||
--- a/cosy.py
|
||||
+++ b/cosy.py
|
||||
@@ -17,7 +17,7 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import sys
|
||||
-from os import path
|
||||
+from os import path, environ
|
||||
from pathlib import Path
|
||||
import argparse
|
||||
import re
|
||||
@@ -156,6 +156,8 @@ def parse_elffile(elffile, prefix, appdir, riot_base=None):
|
||||
|
||||
rbase.append("RIOT")
|
||||
rbase.append("riotbuild/riotbase")
|
||||
+ if "BUILD_DIR" in environ:
|
||||
+ rbase.append(environ["BUILD_DIR"])
|
||||
riot_base = "|".join([f'{p}/build|{p}' for p in rbase])
|
||||
|
||||
c = re.compile(r"(?P<addr>[0-9a-f]+) "
|
||||
--
|
||||
2.39.2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user