LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] kbuild: fix dependency generation
@ 2007-04-01 10:45 Sam Ravnborg
  2007-04-01 15:51 ` Oleg Verych
  0 siblings, 1 reply; 3+ messages in thread
From: Sam Ravnborg @ 2007-04-01 10:45 UTC (permalink / raw)
  To: Linus Torvalds, Andrew Morton, stable; +Cc: LKML, Jan Beulich

From: Jan Beulich <jbeulich@novell.com>

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.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---

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(-)

diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 668a11a..24144a2 100644
--- 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 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);
 	}
 }
-- 
1.5.1.rc3.20.gaa453


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] kbuild: fix dependency generation
  2007-04-01 10:45 [PATCH] kbuild: fix dependency generation Sam Ravnborg
@ 2007-04-01 15:51 ` Oleg Verych
  2007-04-01 18:41   ` Sam Ravnborg
  0 siblings, 1 reply; 3+ messages in thread
From: Oleg Verych @ 2007-04-01 15:51 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: Linus Torvalds, Andrew Morton, stable, LKML, Jan Beulich

> From: Sam Ravnborg
> Newsgroups: gmane.linux.kernel
> Subject: [PATCH] kbuild: fix dependency generation
> Date: Sun, 1 Apr 2007 12:45:51 +0200
>
[]
>  scripts/basic/fixdep.c |   10 +++++++---
>  1 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
> index 668a11a..24144a2 100644
> --- 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 thern let make pick up the changes and the files that uses
            ^ then?                                               ^ use?
> + * the config symbols are rebuild.
                             ^ rebuilt?

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

>   *
>   * 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);
>  	}
>  }
> -- 
> 1.5.1.rc3.20.gaa453
>
____

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] kbuild: fix dependency generation
  2007-04-01 15:51 ` Oleg Verych
@ 2007-04-01 18:41   ` Sam Ravnborg
  0 siblings, 0 replies; 3+ messages in thread
From: Sam Ravnborg @ 2007-04-01 18:41 UTC (permalink / raw)
  To: Oleg Verych; +Cc: Linus Torvalds, Andrew Morton, stable, LKML, Jan Beulich

> > + * the files representing changed config options are touched
> > + * which thern let make pick up the changes and the files that uses
>             ^ then?                                               ^ use?
> > + * 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

>From 67e61a8ae9794106643b9caadf84730daeace4d0 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
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.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
 scripts/basic/fixdep.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 668a11a..6bc7e7c 100644
--- 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);
 	}
 }
-- 
1.5.1.rc3.20.gaa453


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2007-04-01 18:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-04-01 10:45 [PATCH] kbuild: fix dependency generation Sam Ravnborg
2007-04-01 15:51 ` Oleg Verych
2007-04-01 18:41   ` Sam Ravnborg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).