When compiling drivers on Windows, instances have been seen where a
temporary directory fails to get cleaned up due to
ERROR_SHARING_VIOLATION (32).
This issue was not seen on operating systems other than Windows.
This patch eliminates the use of tempfile.TemporaryDirectory, which
was triggering the issue.
Signed-off-by: Andre Muezerie <andre...@linux.microsoft.com>
---
buildtools/gen-pmdinfo-cfile.py | 26 +++++++++++++-------------
buildtools/meson.build | 2 +-
drivers/meson.build | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/buildtools/gen-pmdinfo-cfile.py b/buildtools/gen-pmdinfo-cfile.py
index 5fbd51658a..8ffc192c40 100644
--- a/buildtools/gen-pmdinfo-cfile.py
+++ b/buildtools/gen-pmdinfo-cfile.py
@@ -5,17 +5,17 @@
import os
import subprocess
import sys
-import tempfile
-_, tmp_root, ar, archive, output, *pmdinfogen = sys.argv
-with tempfile.TemporaryDirectory(dir=tmp_root) as temp:
- paths = []
- for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE,
- check=True).stdout.decode().splitlines():
- if os.path.exists(name):
- paths.append(name)
- else:
- subprocess.run([ar, "x", os.path.abspath(archive), name],
- check=True, cwd=temp)
- paths.append(os.path.join(temp, name))
- subprocess.run(pmdinfogen + paths + [output], check=True)
+_, ar, tmp_dir, archive, output, *pmdinfogen = sys.argv
+paths = []
+for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE,
+ check=True).stdout.decode().splitlines():
+ if os.path.exists(name):
+ paths.append(name)
+ else:
+ if not os.path.exists(tmp_dir):
+ os.makedirs(tmp_dir)
+ subprocess.run([ar, "x", os.path.abspath(archive), name],
+ check=True, cwd=tmp_dir)
+ paths.append(os.path.join(tmp_dir, name))
+subprocess.run(pmdinfogen + paths + [output], check=True)
diff --git a/buildtools/meson.build b/buildtools/meson.build
index 1cd1ce02fd..e7c53c9a84 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -34,7 +34,7 @@ install_data([
install_dir: 'bin')
# select library and object file format
-pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()]
+pmdinfo = py3 + files('gen-pmdinfo-cfile.py')
pmdinfogen = py3 + files('pmdinfogen.py')
if host_machine.system() == 'windows'
if cc.get_id() == 'gcc'
diff --git a/drivers/meson.build b/drivers/meson.build
index caee1e3b79..8aad099c40 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -274,7 +274,7 @@ foreach subpath:subdirs
c_args: cflags)
objs += tmp_lib.extract_all_objects(recursive: true)
sources_pmd_info = custom_target(out_filename,
- command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@',
pmdinfogen],
+ command: [pmdinfo, '@PRIVATE_DIR@', tmp_lib.full_path(),
'@OUTPUT@', pmdinfogen],
output: out_filename,
depends: [tmp_lib])
--
2.49.0.vfs.0.2
