fixdep: remove stale references to uml-config.h (14a596a7) · Commits · 戴 / test

uml-config.h hasn't existed in this decade ( - 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. Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Richard Weinberger <richard@nod.at> Cc: user-mode-linux-devel@lists.sourceforge.net Signed-off-by:

Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by:

Masahiro Yamada <yamada.masahiro@socionext.com>

scripts/basic/fixdep.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -93,14 +93,6 @@
		* (Note: it'd be easy to port over the complete mkdep state machine,
		* but I don't think the added complexity is worth it)
		*/
		/*
		* Note 2: if somebody writes HELLO_CONFIG_BOOM in a file, it will depend onto
		* CONFIG_BOOM. This could seem a bug (not too hard to fix), but please do not
		* fix it! Some UserModeLinux files (look at arch/um/) call CONFIG_BOOM as
		* UML_CONFIG_BOOM, to avoid conflicts with /usr/include/linux/autoconf.h,
		* through arch/um/include/uml-config.h; this fixdep "bug" makes sure that
		* those files will have correct dependencies.
		*/

		#include <sys/types.h>
		#include <sys/stat.h>
		@@ -286,7 +278,6 @@ static int is_ignored_file(const char *s, int len)
		{
		return str_ends_with(s, len, "include/generated/autoconf.h") \|\|
		str_ends_with(s, len, "include/generated/autoksyms.h") \|\|
		str_ends_with(s, len, "arch/um/include/uml-config.h") \|\|
		str_ends_with(s, len, "include/linux/kconfig.h") \|\|
		str_ends_with(s, len, ".ver");
		}

Admin message