]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
tools: ynl: add script dir to sys.path
authorJan Stancek <jstancek@redhat.com>
Tue, 12 Nov 2024 08:21:32 +0000 (09:21 +0100)
committerJakub Kicinski <kuba@kernel.org>
Thu, 14 Nov 2024 02:43:45 +0000 (18:43 -0800)
Python options like PYTHONSAFEPATH or -P [1] do not add script
directory to PYTHONPATH. ynl depends on this path to build and run.

[1] This option is default for Fedora rpmbuild since introduction of
    https://fedoraproject.org/wiki/Changes/PythonSafePath

Signed-off-by: Jan Stancek <jstancek@redhat.com>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Donald Hunter <donald.hunter@gmail.com>
Link: https://patch.msgid.link/b26537cdb6e1b24435b50b2ef81d71f31c630bc1.1731399562.git.jstancek@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/net/ynl/cli.py
tools/net/ynl/ethtool.py
tools/net/ynl/ynl-gen-c.py

index 9e95016b85b37720c48268f59d77d4c7d210bfbe..5e2913a7f3e494e3838f01642357af527343167a 100755 (executable)
@@ -3,10 +3,13 @@
 
 import argparse
 import json
+import pathlib
 import pprint
+import sys
 import time
 import signal
 
+sys.path.append(pathlib.Path(__file__).resolve().parent.as_posix())
 from lib import YnlFamily, Netlink, NlError
 
 
index 63c471f075abf893d5b56820b8b249be2df46180..ebb0a11f67bf60d065d50fd190e7610e0c37e103 100755 (executable)
@@ -3,11 +3,13 @@
 
 import argparse
 import json
+import pathlib
 import pprint
 import sys
 import re
 import os
 
+sys.path.append(pathlib.Path(__file__).resolve().parent.as_posix())
 from lib import YnlFamily
 
 def args_to_req(ynl, op_name, args, req):
index c48b690711110f2d7b0c9026f1f9e97652a2067c..394b0023b9a3e0020340f4003ebafffbd90ea7c2 100755 (executable)
@@ -4,12 +4,15 @@
 import argparse
 import collections
 import filecmp
+import pathlib
 import os
 import re
 import shutil
+import sys
 import tempfile
 import yaml
 
+sys.path.append(pathlib.Path(__file__).resolve().parent.as_posix())
 from lib import SpecFamily, SpecAttrSet, SpecAttr, SpecOperation, SpecEnumSet, SpecEnumEntry