mirror of
https://git.yoctoproject.org/poky
synced 2026-03-10 17:29:40 +01:00
wic/engine: error on old host debugfs for standalone directory copy
When wic is used in standalone mode, it relies on host tools such as debugfs. For directory host->image copies into ext* partitions, wic uses scripted debugfs "-f" input with multiple mkdir/write commands. Older host debugfs versions (< 1.46.5) may behave unreliably in this mode and can silently miss files. This does not affect builds using debugfs from OE where the version is known to be sufficiently new. Add a debugfs version check and emit an error when an older host debugfs is detected. The error is shown once per run and halts execution. (From OE-Core rev: 977d68d2702f7092fa05d04f94da5fee8e0b2195) Signed-off-by: Daniel Dragomir <daniel.dragomir@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit cb536737bee95d5a5072b501bda9554705e8cd13) [YC: removed patch changelog] Signed-off-by: Yoann Congal <yoann.congal@smile.fr> Signed-off-by: Paul Barker <paul@pbarker.dev> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
6eea44a7fe
commit
ac842282aa
@@ -220,6 +220,34 @@ def wic_list(args, scripts_path):
|
||||
|
||||
return False
|
||||
|
||||
_DEBUGFS_VERSION = None
|
||||
|
||||
def debugfs_version_check(debugfs_path, min_ver=(1, 46, 5)):
|
||||
global _DEBUGFS_VERSION
|
||||
|
||||
if _DEBUGFS_VERSION is None:
|
||||
out = ""
|
||||
for flag in ("-V", "-v"):
|
||||
try:
|
||||
out = exec_cmd(f"{debugfs_path} {flag}")
|
||||
break
|
||||
except Exception:
|
||||
continue
|
||||
|
||||
import re
|
||||
m = re.search(r"(\d+)\.(\d+)\.(\d+)", out or "")
|
||||
_DEBUGFS_VERSION = tuple(map(int, m.groups())) if m else None
|
||||
|
||||
ver = _DEBUGFS_VERSION
|
||||
|
||||
if ver is not None and ver < min_ver:
|
||||
raise WicError(
|
||||
"Sorry, debugfs 1.46.5 or later is required for this script. "
|
||||
"Older versions of debugfs can make directory copies into ext* partitions "
|
||||
"via scripted debugfs (-f) unreliable or broken. Detected version: %s"
|
||||
% (".".join(map(str, ver)) if ver else "unknown")
|
||||
)
|
||||
|
||||
|
||||
class Disk:
|
||||
def __init__(self, imagepath, native_sysroot, fstypes=('fat', 'ext')):
|
||||
@@ -334,6 +362,7 @@ class Disk:
|
||||
if self.partitions[pnum].fstype.startswith('ext'):
|
||||
if isinstance(src, str): # host to image case
|
||||
if os.path.isdir(src):
|
||||
debugfs_version_check(self.debugfs)
|
||||
base = os.path.abspath(src)
|
||||
base_parent = os.path.dirname(base)
|
||||
cmds = []
|
||||
|
||||
Reference in New Issue
Block a user