From: Fabrice Fontaine Date: Fri, 3 Sep 2021 21:45:25 +0000 (+0200) Subject: package/python-pyudev: fix build with python 2 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=57aa6e718f8adbd0ac324179e28c9549cb862b59;p=buildroot.git package/python-pyudev: fix build with python 2 Build with python 2 is broken since bump to version 0.22.0 in commit 0adb141d342707ca9a478f57f187e38d5bb716f2: error: File "/usr/lib/python2.7/site-packages/pyudev/_ctypeslib/utils.py", line 54 lib = cdll.LoadLibrary(f'lib{name}.so') ^ SyntaxError: invalid syntax Fixes: - http://autobuild.buildroot.org/results/8b35ca6910dfd881953968f8d88ac842d57c9262 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- diff --git a/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch b/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch index 67c2766496..d798f836a5 100644 --- a/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch +++ b/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch @@ -13,6 +13,8 @@ https://github.com/pyudev/pyudev/pull/117 Signed-off-by: Yegor Yefremov [Marcin: adjust to 0.22.0] Signed-off-by: Marcin Niestroj +[Fabrice: Use %-formatting instead of f-string for python 2] +Signed-off-by: Fabrice Fontaine --- src/pyudev/_ctypeslib/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) @@ -37,7 +39,7 @@ index 9dffb3c..aa9942f 100644 - library_name = find_library(name) - if not library_name: + try: -+ lib = cdll.LoadLibrary(f'lib{name}.so') ++ lib = cdll.LoadLibrary('lib%s.so' % name) + except OSError: raise ImportError('No library named %s' % name) - lib = CDLL(library_name, use_errno=True)