scripts/modinfo: add --skip-missing-deps
Add --skip-missing-deps flag that prints warnings for missing dependencies but continues without exiting with error code 1. Acked-by: Mark Cave-Ayland <mark.caveayland@nutanix.com> Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Marc-André Lureau committed
Jan 20, 2026 at 11:42 UTC
492e422b6be66fe7f93acb1869a9a7b944439d93
1 file changed
+71
-23
scripts/modinfo-generate.py
+71
-23
@@ -34,7 +34,8 @@ def parse_line(line: str) -> tuple[str, str]:
34
continue
35
return (kind, data)
36
37
-def generate(name: str, lines: list[str], enabled: set[str]) -> Optional[set[str]]:
37
+def parse_modinfo(name: str, lines: list[str], enabled: set[str]) -> Optional[dict]:
38
+ """Parse a modinfo file and return module metadata, or None if disabled."""
39
arch = ""
40
objs = []
41
deps = []
@@ -54,21 +55,39 @@ def generate(name: str, lines: list[str], enabled: set[str]) -> Optional[set[str
55
# don't add a module which dependency is not enabled
56
# in kconfig
57
if data.strip() not in enabled:
57
- print(f" /* module {data.strip()} isn't enabled in Kconfig. */")
58
- print("/* },{ */")
58
return None
59
else:
60
print("unknown:", kind)
61
exit(1)
62
64
- print(f' .name = "{name}",')
65
- if arch != "":
66
- print(f" .arch = {arch},")
67
- print_array("objs", objs)
68
- print_array("deps", deps)
69
- print_array("opts", opts)
63
+ return {
64
+ 'name': name,
65
+ 'arch': arch,
66
+ 'objs': objs,
67
+ 'deps': deps,
68
+ 'opts': opts,
69
+ 'dep_names': {dep.strip('" ') for dep in deps}
70
+ }
71
+
72
+def generate(modinfo: str, mod: Optional[dict],
73
+ skip_reason: Optional[str]) -> None:
74
+ """Generate C code for a module."""
75
+ print(f" /* {modinfo} */")
76
+ if mod is None:
77
+ if skip_reason == "missing_deps":
78
+ print(" /* module has missing dependencies. */")
79
+ else:
80
+ print(" /* module isn't enabled in Kconfig. */")
81
+ print("/* },{ */")
82
+ return
83
+
84
+ print(f' .name = "{mod["name"]}",')
85
+ if mod['arch'] != "":
86
+ print(f" .arch = {mod['arch']},")
87
+ print_array("objs", mod['objs'])
88
+ print_array("deps", mod['deps'])
89
+ print_array("opts", mod['opts'])
90
print("},{")
71
- return {dep.strip('" ') for dep in deps}
91
92
def print_pre() -> None:
93
print("/* generated by scripts/modinfo-generate.py */")
@@ -86,6 +105,8 @@ def main() -> None:
105
)
106
parser.add_argument('--devices',
107
help='path to config-device.mak')
108
+ parser.add_argument('--skip-missing-deps', action='store_true',
109
+ help='warn if a dependency is missing and continue')
110
parser.add_argument('modinfo', nargs='+',
111
help='modinfo files to process')
112
args = parser.parse_args()
@@ -99,27 +120,54 @@ def main() -> None:
120
if config[1].rstrip() == 'y':
121
enabled.add(config[0][7:]) # remove CONFIG_
122
102
- deps = set()
103
- modules = set()
104
- print_pre()
123
+ # all_modules: modinfo path -> (basename, parsed module or None, skip_reason)
124
+ all_modules = {}
125
for modinfo in args.modinfo:
126
with open(modinfo) as f:
127
lines = f.readlines()
108
- print(f" /* {modinfo} */")
128
(basename, _) = os.path.splitext(modinfo)
110
- moddeps = generate(basename, lines, enabled)
111
- if moddeps is not None:
112
- modules.add(basename)
113
- deps.update(moddeps)
114
- print_post()
129
+ mod = parse_modinfo(basename, lines, enabled)
130
+ skip_reason = "kconfig" if mod is None else None
131
+ all_modules[modinfo] = (basename, mod, skip_reason)
132
+
133
+ # Collect all available module names
134
+ available = {basename for basename, mod, _ in all_modules.values()
135
+ if mod is not None}
136
116
- error = False
117
- for dep in deps.difference(modules):
137
+ # Collect all dependencies
138
+ all_deps = set()
139
+ for basename, mod, _ in all_modules.values():
140
+ if mod is not None:
141
+ all_deps.update(mod['dep_names'])
142
+
143
+ # Check for missing dependencies
144
+ missing = all_deps.difference(available)
145
+ for dep in missing:
146
print(f"Dependency {dep} cannot be satisfied", file=sys.stderr)
119
- error = True
147
121
- if error:
148
+ if missing and not args.skip_missing_deps:
149
exit(1)
150
151
+ # When skipping missing deps, iteratively remove modules with
152
+ # unsatisfiable dependencies
153
+ if args.skip_missing_deps and missing:
154
+ changed = True
155
+ while changed:
156
+ changed = False
157
+ for modinfo, (basename, mod, skip_reason) in list(all_modules.items()):
158
+ if mod is None:
159
+ continue
160
+ if not mod['dep_names'].issubset(available):
161
+ available.discard(basename)
162
+ all_modules[modinfo] = (basename, None, "missing_deps")
163
+ changed = True
164
+
165
+ # generate output
166
+ print_pre()
167
+ for modinfo in args.modinfo:
168
+ (basename, mod, skip_reason) = all_modules[modinfo]
169
+ generate(modinfo, mod, skip_reason)
170
+ print_post()
171
+
172
if __name__ == "__main__":
173
main()