LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Jan Beulich" <jbeulich@novell.com>
To: <sam@ravnborg.org>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH] fix dependency generation
Date: Thu, 29 Mar 2007 10:27:14 +0100	[thread overview]
Message-ID: <460BA292.76E4.0078.0@novell.com> (raw)

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.

Once at it, also eliminate false dependencies due to use of
...CONFIG_... identifiers.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

--- linux-2.6.21-rc5/scripts/basic/fixdep.c	2007-02-04 19:44:54.000000000 +0100
+++ 2.6.21-rc5-fixdep-mod/scripts/basic/fixdep.c	2007-03-29 11:11:10.000000000 +0200
@@ -29,8 +29,7 @@
  * 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.
+ * e.g. include/config/his/driver.h, consiting of empty files.
  *
  * 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,
@@ -223,7 +222,7 @@ void use_config(char *m, int slen)
 void parse_config_file(char *map, size_t len)
 {
 	int *end = (int *) (map + len);
-	/* start at +1, so that p can never be < map */
+	/* start at +1, so that p can never be <= map */
 	int *m   = (int *) map + 1;
 	char *p, *q;
 
@@ -235,6 +234,8 @@ void parse_config_file(char *map, size_t
 		continue;
 	conf:
 		if (p > map + len - 7)
+			break;
+		if (isalnum(p[-1]) || p[-1] == '_')
 			continue;
 		if (memcmp(p, "CONFIG_", 7))
 			continue;
@@ -245,6 +246,8 @@ void parse_config_file(char *map, size_t
 		continue;
 
 	found:
+		if (!memcmp(q - 7, "_MODULE", 7))
+			q -= 7;
 		use_config(p+7, q-p-7);
 	}
 }



             reply	other threads:[~2007-03-29  9:26 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-03-29  9:27 Jan Beulich [this message]
2007-03-29 15:39 ` Randy Dunlap
2007-03-29 16:06   ` Jan Beulich
2007-03-29 16:38     ` Randy Dunlap
2007-03-30  9:14       ` Jan Beulich
2007-03-30 15:17         ` Randy Dunlap
2007-03-30 15:08 ` Sam Ravnborg
2007-03-30 15:43   ` Jan Beulich
2007-03-30 17:14     ` Jeff Dike
2007-03-31  6:42 ` Sam Ravnborg
2007-03-31  7:39   ` [PATCH 1/2] kconfig: factor out code in conf_spilt_config Sam Ravnborg
2007-03-31  7:40   ` [PATCH 2/2] kconfig/kbuild: fix dependency problem Sam Ravnborg
2007-03-31 16:11   ` [PATCH] fix dependency generation Roman Zippel
2007-04-01 18:45     ` Sam Ravnborg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=460BA292.76E4.0078.0@novell.com \
    --to=jbeulich@novell.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sam@ravnborg.org \
    --subject='Re: [PATCH] fix dependency generation' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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