[PATCH v2 04/22] verification/dot2k: Make it possible to invoke dot2k without installation

From: Nam Cao
Date: Fri Apr 11 2025 - 03:38:31 EST


Without installation, dot2k doesn't work:

namcao@yellow:~/linux/tools/verification$ python3 ./dot2/dot2k
Traceback (most recent call last):
File "/home/namcao/linux/tools/verification/./dot2/dot2k", line 12, in <module>
from dot2.dot2k import dot2k
ModuleNotFoundError: No module named 'dot2'

Installing dot2k to the system is not always desirable. Sometimes it is not
even possible (e.g. no root permission).

Restructure the files to make it work without installing.

Signed-off-by: Nam Cao <namcao@xxxxxxxxxxxxx>
---
tools/verification/dot2/Makefile | 6 +++---
tools/verification/dot2/{ => dot2}/automata.py | 0
tools/verification/dot2/{ => dot2}/dot2c.py | 0
tools/verification/dot2/{ => dot2}/dot2k.py | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename tools/verification/dot2/{ => dot2}/automata.py (100%)
rename tools/verification/dot2/{ => dot2}/dot2c.py (100%)
rename tools/verification/dot2/{ => dot2}/dot2k.py (100%)

diff --git a/tools/verification/dot2/Makefile b/tools/verification/dot2/Makefile
index 021beb07a521..7a2ec30014b0 100644
--- a/tools/verification/dot2/Makefile
+++ b/tools/verification/dot2/Makefile
@@ -16,10 +16,10 @@ clean:

.PHONY: install
install:
- $(INSTALL) automata.py -D -m 644 $(DESTDIR)$(PYLIB)/dot2/automata.py
- $(INSTALL) dot2c.py -D -m 644 $(DESTDIR)$(PYLIB)/dot2/dot2c.py
+ $(INSTALL) dot2/automata.py -D -m 644 $(DESTDIR)$(PYLIB)/dot2/automata.py
+ $(INSTALL) dot2/dot2c.py -D -m 644 $(DESTDIR)$(PYLIB)/dot2/dot2c.py
$(INSTALL) dot2c -D -m 755 $(DESTDIR)$(bindir)/
- $(INSTALL) dot2k.py -D -m 644 $(DESTDIR)$(PYLIB)/dot2/dot2k.py
+ $(INSTALL) dot2/dot2k.py -D -m 644 $(DESTDIR)$(PYLIB)/dot2/dot2k.py
$(INSTALL) dot2k -D -m 755 $(DESTDIR)$(bindir)/

mkdir -p ${miscdir}/
diff --git a/tools/verification/dot2/automata.py b/tools/verification/dot2/dot2/automata.py
similarity index 100%
rename from tools/verification/dot2/automata.py
rename to tools/verification/dot2/dot2/automata.py
diff --git a/tools/verification/dot2/dot2c.py b/tools/verification/dot2/dot2/dot2c.py
similarity index 100%
rename from tools/verification/dot2/dot2c.py
rename to tools/verification/dot2/dot2/dot2c.py
diff --git a/tools/verification/dot2/dot2k.py b/tools/verification/dot2/dot2/dot2k.py
similarity index 100%
rename from tools/verification/dot2/dot2k.py
rename to tools/verification/dot2/dot2/dot2k.py
--
2.39.5