[PATCH] kbuild: fix dependency generation

Jan Beulich · Linus Torvalds · commit c21b1e4d9b0c · 2007-04-01T14:23:57.000-07:00
Commit 2e3646e changed the way the split config tree is built, but failed to also adjust fixdep accordingly - if changing a config option from or to m, files referencing the respective CONFIG_..._MODULE (but not the corresponding CONFIG_...) didn't get rebuilt. The problem is that trisate symbol are represent with three different symbols: SYMBOL=n => no symbol defined SYMBOL=y => CONFIG_SYMBOL defined to '1' SYMBOL=m => CONFIG_SYMBOL_MODULE defined to '1' But conf_split_config do not distingush between the =y and =m case, so only the =y case is honoured. This is fixed in fixdep so when a CONFIG symbol with _MODULE is found we skip that part and only look for the CONFIG_SYMBOL version. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
@@ -28,9 +28,11 @@
  * the dependency on linux/autoconf.h by a dependency on every config
  * option which is mentioned in any of the listed prequisites.
  *
- * To be exact, split-include populates a tree in include/config/,
- * e.g. include/config/his/driver.h, which contains the #define/#undef
- * for the CONFIG_HIS_DRIVER option.
+ * kconfig populates a tree in include/config/ with an empty file
+ * for each config symbol and when the configuration is updated
+ * the files representing changed config options are touched
+ * which then let make pick up the changes and the files that use
+ * the config symbols are rebuilt.
  *
  * So if the user changes his CONFIG_HIS_DRIVER option, only the objects
  * which depend on "include/linux/config/his/driver.h" will be rebuilt,
@@ -245,6 +247,8 @@ void parse_config_file(char *map, size_t len)
 		continue;
 
 	found:
+		if (!memcmp(q - 7, "_MODULE", 7))
+			q -= 7;
 		use_config(p+7, q-p-7);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,11 @@`
`28`	`28`	`* the dependency on linux/autoconf.h by a dependency on every config`
`29`	`29`	`* option which is mentioned in any of the listed prequisites.`
`30`	`30`	`*`
`31`		`- * To be exact, split-include populates a tree in include/config/,`
`32`		`- * e.g. include/config/his/driver.h, which contains the #define/#undef`
`33`		`- * for the CONFIG_HIS_DRIVER option.`
	`31`	`+ * kconfig populates a tree in include/config/ with an empty file`
	`32`	`+ * for each config symbol and when the configuration is updated`
	`33`	`+ * the files representing changed config options are touched`
	`34`	`+ * which then let make pick up the changes and the files that use`
	`35`	`+ * the config symbols are rebuilt.`
`34`	`36`	`*`
`35`	`37`	`* So if the user changes his CONFIG_HIS_DRIVER option, only the objects`
`36`	`38`	`* which depend on "include/linux/config/his/driver.h" will be rebuilt,`
`@@ -245,6 +247,8 @@ void parse_config_file(char *map, size_t len)`
`245`	`247`	`continue;`
`246`	`248`
`247`	`249`	`found:`
	`250`	`+ if (!memcmp(q - 7, "_MODULE", 7))`
	`251`	`+ q -= 7;`
`248`	`252`	`use_config(p+7, q-p-7);`
`249`	`253`	`}`
`250`	`254`	`}`