]> www.infradead.org Git - users/hch/misc.git/commitdiff
tools/net/ynl: ethtool: support spec load from install location
authorDonald Hunter <donald.hunter@gmail.com>
Sat, 11 Jan 2025 15:48:03 +0000 (15:48 +0000)
committerJakub Kicinski <kuba@kernel.org>
Tue, 14 Jan 2025 03:06:10 +0000 (19:06 -0800)
Replace hard-coded paths for spec and schema with lookup functions so
that ethtool.py will work in-tree or when installed.

Signed-off-by: Donald Hunter <donald.hunter@gmail.com>
Link: https://patch.msgid.link/20250111154803.7496-2-donald.hunter@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/net/ynl/pyynl/ethtool.py

index ebb0a11f67bf60d065d50fd190e7610e0c37e103..af7fddd7b085bf5558e8f1514a8fc1e90dcc04e2 100755 (executable)
@@ -11,6 +11,7 @@ import os
 
 sys.path.append(pathlib.Path(__file__).resolve().parent.as_posix())
 from lib import YnlFamily
+from cli import schema_dir, spec_dir
 
 def args_to_req(ynl, op_name, args, req):
     """
@@ -156,10 +157,8 @@ def main():
     args = parser.parse_args()
 
     script_abs_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
-    spec = os.path.join(script_abs_dir,
-                        '../../../Documentation/netlink/specs/ethtool.yaml')
-    schema = os.path.join(script_abs_dir,
-                          '../../../Documentation/netlink/genetlink-legacy.yaml')
+    spec = os.path.join(spec_dir(), 'ethtool.yaml')
+    schema = os.path.join(schema_dir(), 'genetlink-legacy.yaml')
 
     ynl = YnlFamily(spec, schema)