History

fixdep: remove stale references to uml-config.h

uml-config.h hasn't existed in this decade (87e299e5c750 - x86, um: get rid of uml-config.h). The few remaining UML_CONFIG instances are defined directly in terms of their real CONFIG symbol in common-offsets.h, so unlike when the symbols got defined via a sed script, anything that uses UML_CONFIG_FOO now should also automatically pick up a dependency on CONFIG_FOO via the normal fixdep mechanism (since common-offsets.h should at least recursively be a dependency). Hence I believe we should actually be able to ignore the HELLO_CONFIG_BOOM cases.

Rasmus Villemoes committed 8 years ago

Commit 14a596a1 parent 661e50b1 file · +0 −9Browse files

Showing the changes to scripts/basic (1 of 1 file). Show all

Unified · Split

scripts/basic/fixdep.c+0−9
@@ -93,14 +93,6 @@ · 92 unmodified lines
9393 * (Note: it'd be easy to port over the complete mkdep state machine,
9494 * but I don't think the added complexity is worth it)
9595 */
96−/*
97− * Note 2: if somebody writes HELLO_CONFIG_BOOM in a file, it will depend onto
98− * CONFIG_BOOM. This could seem a bug (not too hard to fix), but please do not
99− * fix it! Some UserModeLinux files (look at arch/um/) call CONFIG_BOOM as
100− * UML_CONFIG_BOOM, to avoid conflicts with /usr/include/linux/autoconf.h,
101− * through arch/um/include/uml-config.h; this fixdep "bug" makes sure that
102− * those files will have correct dependencies.
103− */
10496
10597 #include <sys/types.h>
10698 #include <sys/stat.h>
@@ -286,7 +278,6 @@ static int is_ignored_file(const char *s, int len) · 179 unmodified lines
286278 {
287279 return str_ends_with(s, len, "include/generated/autoconf.h") ||
288280 str_ends_with(s, len, "include/generated/autoksyms.h") ||
289− str_ends_with(s, len, "arch/um/include/uml-config.h") ||
290281 str_ends_with(s, len, "include/linux/kconfig.h") ||
291282 str_ends_with(s, len, ".ver");
292283 }