Skip to contentSkip to conversation

kbuild: fix dependency generation

PATCH In review Sam Ravnborg 2 participants 3 messages Apr 1, 2007 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: fix dependency generation

From: Jan Beulich <[email protected]>

Commit 2e3646e51b2d6415549b310655df63e7e0d7a080 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.

---

The patch can be pulled from:
ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix.git [Contains only this fix]

Included below for reference and for -stable.

This should be applied to both latest -rc and stable.

Sam

 scripts/basic/fixdep.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
scripts/basic/fixdep.c +7 -3
index 668a11a..24144a2 100644
@@ -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 thern let make pick up the changes and the files that uses
+ * the config symbols are rebuild.
  *
  * 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);
 	}
 }
Signature · 1 line
1.5.1.rc3.20.gaa453
#1 lore raw
Quoted 5 lines

From: Sam Ravnborg
Newsgroups: gmane.linux.kernel
Subject: [PATCH] kbuild: fix dependency generation
Date: Sun, 1 Apr 2007 12:45:51 +0200

[]

Quoted 8 lines
 scripts/basic/fixdep.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
scripts/basic/fixdep.c +0 -0
index 668a11a..24144a2 100644

scripts/basic/fixdep.c line 34

Quoted 10 lines
scripts/basic/fixdep.c +4 -3
@@ -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 thern let make pick up the changes and the files that uses

^ then? ^ use?

scripts/basic/fixdep.c line 35

Quoted 1 line
scripts/basic/fixdep.c +1 -0
+ * the config symbols are rebuild.

^ rebuilt?

Just in case that's wrong (IANALang, of course :)

Quoted 15 lines
scripts/basic/fixdep.c +2 -0
  *
  * 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);
 	}
 }
Signature · 1 line
1.5.1.rc3.20.gaa453

____

#2 lore raw
Quoted 6 lines
Quoted 2 lines

+ * the files representing changed config options are touched
+ * which thern let make pick up the changes and the files that uses

^ then? ^ use?

Quoted 1 line

+ * the config symbols are rebuild.

^ rebuilt?

Thanks. Updated patch pushed out to:
ssh://git.kernel.org/pub/scm/linux/kernel/git/kbuild-fix.git

and included below.

Sam

Quoted 1 line

From 67e61a8ae9794106643b9caadf84730daeace4d0 Mon Sep 17 00:00:00 2001

From: Jan Beulich <[email protected]>
Date: Thu, 29 Mar 2007 10:27:14 +0100
Subject: [PATCH] kbuild: fix dependency generation

Commit 2e3646e51b2d6415549b310655df63e7e0d7a080 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.

---
 scripts/basic/fixdep.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
scripts/basic/fixdep.c +7 -3
index 668a11a..6bc7e7c 100644
@@ -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);
 	}
 }
Signature · 1 line
1.5.1.rc3.20.gaa453