Skip to contentSkip to conversation

easier customization of kconfig for non-Linux projects

rfe Mike Frysinger 3 participants 5 messages May 24, 2007 Kconfig

lore
Share & tools
lore
#0 lore raw

since kconfig is such a nice build system, more projects other than the Linux kernel have started to integrate it (like uClibc and busybox) ... it'd be nice if it were easier to customize for each project so that when we pull down the latest version, we dont have to go through and tweak all of the strings again. what do you think of something like the attached patch ? i doubt i caught all the places that'd need to be changed, but this should give a pretty good picture of what we'd like to have.

---

scripts/kconfig/lkc_local.h +15 -0
@@ -0,0 +1,15 @@
+/*
+ * Customize kconfig to your project.
+ *
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#ifndef LKC_LOCAL_H
+#define LKC_LOCAL_H
+
+#define PROJECT           "Linux Kernel"
+#define PROJECT_INFORMAL  "kernel"
+#define VERSION_SYMBOL    "KERNELVERSION"
+#define AUTOCONF_DEFINE   "AUTOCONF_INCLUDED"
+
+#endif
scripts/kconfig/conf.c +5 -5
index 1199baf..a5f5102 100644
@@ -557,8 +557,8 @@ int main(int ac, char **av)
 	case ask_silent:
 		if (stat(".config", &tmpstat)) {
 			printf(_("***\n"
-				"*** You have not yet configured your kernel!\n"
-				"*** (missing kernel .config file)\n"
+				"*** You have not yet configured your " PROJECT_INFORMAL "!\n"
+				"*** (missing " PROJECT_INFORMAL " .config file)\n"
 				"***\n"
 				"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
 				"*** \"make menuconfig\" or \"make xconfig\").\n"
@@ -604,7 +604,7 @@ int main(int ac, char **av)
 	} else if (conf_get_changed()) {
 		name = getenv("KCONFIG_NOSILENTUPDATE");
 		if (name && *name) {
-			fprintf(stderr, _("\n*** Kernel configuration requires explicit update.\n\n"));
+			fprintf(stderr, _("\n*** " PROJECT " configuration requires explicit update.\n\n"));
 			return 1;
 		}
 	} else
@@ -615,12 +615,12 @@ int main(int ac, char **av)
 		check_conf(&rootmenu);
 	} while (conf_cnt);
 	if (conf_write(NULL)) {
-		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
+		fprintf(stderr, _("\n*** Error during writing of the " PROJECT_INFORMAL " configuration.\n\n"));
 		return 1;
 	}
 skip_check:
 	if (input_mode == ask_silent && conf_write_autoconf()) {
-		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
+		fprintf(stderr, _("\n*** Error during writing of the " PROJECT_INFORMAL " configuration.\n\n"));
 		return 1;
 	}
 
scripts/kconfig/confdata.c +6 -6
index 664fe29..06366ed 100644
@@ -416,7 +416,7 @@ int conf_write(const char *name)
 	if (!out)
 		return 1;
 
-	sym = sym_lookup("KERNELVERSION", 0);
+	sym = sym_lookup(VERSION_SYMBOL, 0);
 	sym_calc_value(sym);
 	time(&now);
 	env = getenv("KCONFIG_NOTIMESTAMP");
@@ -425,7 +425,7 @@ int conf_write(const char *name)
 
 	fprintf(out, _("#\n"
 		       "# Automatically generated make config: don't edit\n"
-		       "# Linux kernel version: %s\n"
+		       "# " PROJECT " version: %s\n"
 		       "%s%s"
 		       "#\n"),
 		     sym_get_string_value(sym),
@@ -672,21 +672,21 @@ int conf_write_autoconf(void)
 		return 1;
 	}
 
-	sym = sym_lookup("KERNELVERSION", 0);
+	sym = sym_lookup(VERSION_SYMBOL, 0);
 	sym_calc_value(sym);
 	time(&now);
 	fprintf(out, "#\n"
 		     "# Automatically generated make config: don't edit\n"
-		     "# Linux kernel version: %s\n"
+		     "# " PROJECT " version: %s\n"
 		     "# %s"
 		     "#\n",
 		     sym_get_string_value(sym), ctime(&now));
 	fprintf(out_h, "/*\n"
 		       " * Automatically generated C config: don't edit\n"
-		       " * Linux kernel version: %s\n"
+		       " * " PROJECT " version: %s\n"
 		       " * %s"
 		       " */\n"
-		       "#define AUTOCONF_INCLUDED\n",
+		       "#define " AUTOCONF_DEFINE "\n",
 		       sym_get_string_value(sym), ctime(&now));
 
 	for_all_symbols(i, sym) {
scripts/kconfig/gconf.c +2 -2
index 61d8166..ba62d64 100644
@@ -271,8 +271,8 @@ void init_main_window(const gchar * glade_file)
 					  /*"style", PANGO_STYLE_OBLIQUE, */
 					  NULL);
 
-	sprintf(title, _("Linux Kernel v%s Configuration"),
-		getenv("KERNELVERSION"));
+	sprintf(title, _(PROJECT " v%s Configuration"),
+		getenv(VERSION_SYMBOL));
 	gtk_window_set_title(GTK_WINDOW(main_wnd), title);
 
 	gtk_widget_show(main_wnd);
scripts/kconfig/lkc.h +2 -0
index 8a07ee4..e694cda 100644
@@ -6,6 +6,8 @@
 #ifndef LKC_H
 #define LKC_H
 
+#include "lkc_local.h"
+
 #include "expr.h"
 
 #ifndef KBUILD_NO_NLS
scripts/kconfig/mconf.c +4 -4
index d0e4fa5..344f777 100644
@@ -400,10 +400,10 @@ static void set_config_filename(const char *config_filename)
 	int size;
 	struct symbol *sym;
 
-	sym = sym_lookup("KERNELVERSION", 0);
+	sym = sym_lookup(VERSION_SYMBOL, 0);
 	sym_calc_value(sym);
 	size = snprintf(menu_backtitle, sizeof(menu_backtitle),
-	                _("%s - Linux Kernel v%s Configuration"),
+	                _("%s - " PROJECT " v%s Configuration"),
 		        config_filename, sym_get_string_value(sym));
 	if (size >= sizeof(menu_backtitle))
 		menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
@@ -931,8 +931,8 @@ int main(int ac, char **av)
 		}
 	case -1:
 		printf(_("\n\n"
-			"*** End of Linux kernel configuration.\n"
-			"*** Execute 'make' to build the kernel or try 'make help'."
+			"*** End of " PROJECT " configuration.\n"
+			"*** Execute 'make' to build the " PROJECT_INFORMAL " or try 'make help'."
 			"\n\n"));
 		break;
 	default:
scripts/kconfig/symbol.c +2 -2
index c35dcc5..004b7df 100644
@@ -61,10 +61,10 @@ void sym_init(void)
 	if (p)
 		sym_add_default(sym, p);
 
-	sym = sym_lookup("KERNELVERSION", 0);
+	sym = sym_lookup(VERSION_SYMBOL, 0);
 	sym->type = S_STRING;
 	sym->flags |= SYMBOL_AUTO;
-	p = getenv("KERNELVERSION");
+	p = getenv(VERSION_SYMBOL);
 	if (p)
 		sym_add_default(sym, p);
 
#1 lore raw

Hi Mike.

Forwarding this to Roman Zippel which is the kconfig maintainer.

The intent with this is clear but the solution you suggest albeit simple does not really match where we could end up with kconfig. Recently Roman added support for options in the kconfig language and I would assume we could deal with most of this just using options.

One example could be to support options for the mainmenu entrye like this:

mainmenu "Busybow config system"
option project="Busybox"
option version="$VERSION" <= Where '$' signify an environment variable

etc etc.

In this way we could later distribute kconfig as a binary instead of building it into the source as today.

Sam

Quoted 188 lines · Mike Frysinger

since kconfig is such a nice build system, more projects other than the Linux kernel have started to integrate it (like uClibc and busybox) ... it'd be nice if it were easier to customize for each project so that when we pull down the latest version, we dont have to go through and tweak all of the strings again. what do you think of something like the attached patch ? i doubt i caught all the places that'd need to be changed, but this should give a pretty good picture of what we'd like to have.

---

scripts/kconfig/lkc_local.h +15 -0
@@ -0,0 +1,15 @@
+/*
+ * Customize kconfig to your project.
+ *
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#ifndef LKC_LOCAL_H
+#define LKC_LOCAL_H
+
+#define PROJECT           "Linux Kernel"
+#define PROJECT_INFORMAL  "kernel"
+#define VERSION_SYMBOL    "KERNELVERSION"
+#define AUTOCONF_DEFINE   "AUTOCONF_INCLUDED"
+
+#endif
scripts/kconfig/conf.c +5 -5
index 1199baf..a5f5102 100644
@@ -557,8 +557,8 @@ int main(int ac, char **av)
 	case ask_silent:
 		if (stat(".config", &tmpstat)) {
 			printf(_("***\n"
-				"*** You have not yet configured your kernel!\n"
-				"*** (missing kernel .config file)\n"
+				"*** You have not yet configured your " PROJECT_INFORMAL "!\n"
+				"*** (missing " PROJECT_INFORMAL " .config file)\n"
 				"***\n"
 				"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
 				"*** \"make menuconfig\" or \"make xconfig\").\n"
@@ -604,7 +604,7 @@ int main(int ac, char **av)
 	} else if (conf_get_changed()) {
 		name = getenv("KCONFIG_NOSILENTUPDATE");
 		if (name && *name) {
-			fprintf(stderr, _("\n*** Kernel configuration requires explicit update.\n\n"));
+			fprintf(stderr, _("\n*** " PROJECT " configuration requires explicit update.\n\n"));
 			return 1;
 		}
 	} else
@@ -615,12 +615,12 @@ int main(int ac, char **av)
 		check_conf(&rootmenu);
 	} while (conf_cnt);
 	if (conf_write(NULL)) {
-		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
+		fprintf(stderr, _("\n*** Error during writing of the " PROJECT_INFORMAL " configuration.\n\n"));
 		return 1;
 	}
 skip_check:
 	if (input_mode == ask_silent && conf_write_autoconf()) {
-		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
+		fprintf(stderr, _("\n*** Error during writing of the " PROJECT_INFORMAL " configuration.\n\n"));
 		return 1;
 	}
 
scripts/kconfig/confdata.c +6 -6
index 664fe29..06366ed 100644
@@ -416,7 +416,7 @@ int conf_write(const char *name)
 	if (!out)
 		return 1;
 
-	sym = sym_lookup("KERNELVERSION", 0);
+	sym = sym_lookup(VERSION_SYMBOL, 0);
 	sym_calc_value(sym);
 	time(&now);
 	env = getenv("KCONFIG_NOTIMESTAMP");
@@ -425,7 +425,7 @@ int conf_write(const char *name)
 
 	fprintf(out, _("#\n"
 		       "# Automatically generated make config: don't edit\n"
-		       "# Linux kernel version: %s\n"
+		       "# " PROJECT " version: %s\n"
 		       "%s%s"
 		       "#\n"),
 		     sym_get_string_value(sym),
@@ -672,21 +672,21 @@ int conf_write_autoconf(void)
 		return 1;
 	}
 
-	sym = sym_lookup("KERNELVERSION", 0);
+	sym = sym_lookup(VERSION_SYMBOL, 0);
 	sym_calc_value(sym);
 	time(&now);
 	fprintf(out, "#\n"
 		     "# Automatically generated make config: don't edit\n"
-		     "# Linux kernel version: %s\n"
+		     "# " PROJECT " version: %s\n"
 		     "# %s"
 		     "#\n",
 		     sym_get_string_value(sym), ctime(&now));
 	fprintf(out_h, "/*\n"
 		       " * Automatically generated C config: don't edit\n"
-		       " * Linux kernel version: %s\n"
+		       " * " PROJECT " version: %s\n"
 		       " * %s"
 		       " */\n"
-		       "#define AUTOCONF_INCLUDED\n",
+		       "#define " AUTOCONF_DEFINE "\n",
 		       sym_get_string_value(sym), ctime(&now));
 
 	for_all_symbols(i, sym) {
scripts/kconfig/gconf.c +2 -2
index 61d8166..ba62d64 100644
@@ -271,8 +271,8 @@ void init_main_window(const gchar * glade_file)
 					  /*"style", PANGO_STYLE_OBLIQUE, */
 					  NULL);
 
-	sprintf(title, _("Linux Kernel v%s Configuration"),
-		getenv("KERNELVERSION"));
+	sprintf(title, _(PROJECT " v%s Configuration"),
+		getenv(VERSION_SYMBOL));
 	gtk_window_set_title(GTK_WINDOW(main_wnd), title);
 
 	gtk_widget_show(main_wnd);
scripts/kconfig/lkc.h +2 -0
index 8a07ee4..e694cda 100644
@@ -6,6 +6,8 @@
 #ifndef LKC_H
 #define LKC_H
 
+#include "lkc_local.h"
+
 #include "expr.h"
 
 #ifndef KBUILD_NO_NLS
scripts/kconfig/mconf.c +4 -4
index d0e4fa5..344f777 100644
@@ -400,10 +400,10 @@ static void set_config_filename(const char *config_filename)
 	int size;
 	struct symbol *sym;
 
-	sym = sym_lookup("KERNELVERSION", 0);
+	sym = sym_lookup(VERSION_SYMBOL, 0);
 	sym_calc_value(sym);
 	size = snprintf(menu_backtitle, sizeof(menu_backtitle),
-	                _("%s - Linux Kernel v%s Configuration"),
+	                _("%s - " PROJECT " v%s Configuration"),
 		        config_filename, sym_get_string_value(sym));
 	if (size >= sizeof(menu_backtitle))
 		menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
@@ -931,8 +931,8 @@ int main(int ac, char **av)
 		}
 	case -1:
 		printf(_("\n\n"
-			"*** End of Linux kernel configuration.\n"
-			"*** Execute 'make' to build the kernel or try 'make help'."
+			"*** End of " PROJECT " configuration.\n"
+			"*** Execute 'make' to build the " PROJECT_INFORMAL " or try 'make help'."
 			"\n\n"));
 		break;
 	default:
scripts/kconfig/symbol.c +2 -2
index c35dcc5..004b7df 100644
@@ -61,10 +61,10 @@ void sym_init(void)
 	if (p)
 		sym_add_default(sym, p);
 
-	sym = sym_lookup("KERNELVERSION", 0);
+	sym = sym_lookup(VERSION_SYMBOL, 0);
 	sym->type = S_STRING;
 	sym->flags |= SYMBOL_AUTO;
-	p = getenv("KERNELVERSION");
+	p = getenv(VERSION_SYMBOL);
 	if (p)
 		sym_add_default(sym, p);
 
#2 lore raw
Quoted 4 lines · Sam Ravnborg

The intent with this is clear but the solution you suggest albeit simple does not really match where we could end up with kconfig. Recently Roman added support for options in the kconfig language and I would assume we could deal with most of this just using options.

that certainly sounds nicer :)

Quoted 5 lines

One example could be to support options for the mainmenu entrye like this:

mainmenu "Busybow config system"
option project="Busybox"
option version="$VERSION" <= Where '$' signify an environment variable

this is doable now ? if so, i'll test it out in uClibc ...

Quoted 2 lines

In this way we could later distribute kconfig as a binary instead of building it into the source as today.

not entirely sure how useful that'd be unless you mean as a completely sep package that distributions would include ...
-mike

#3 lore raw
Quoted 8 lines · Mike Frysinger
Quoted 4 lines · Sam Ravnborg

The intent with this is clear but the solution you suggest albeit simple does not really match where we could end up with kconfig. Recently Roman added support for options in the kconfig language and I would assume we could deal with most of this just using options.

that certainly sounds nicer :)

Quoted 7 lines
Quoted 5 lines

One example could be to support options for the mainmenu entrye like this:

mainmenu "Busybow config system"
option project="Busybox"
option version="$VERSION" <= Where '$' signify an environment variable

this is doable now ? if so, i'll test it out in uClibc ...

No - it was just a proposal.
Would like to have a word from Roman before looking deeper into it.

Sam

#4 lore raw
In reply to Sam Ravnborg

Hello all!

Sorry to jump into the discussion, but...

Quoted 10 lines · Sam Ravnborg

The intent with this is clear but the solution you suggest albeit simple does not really match where we could end up with kconfig. Recently Roman added support for options in the kconfig language and I would assume we could deal with most of this just using options.

One example could be to support options for the mainmenu entrye like this:

mainmenu "Busybow config system"
option project="Busybox"
option version="$VERSION" <= Where '$' signify an environment variable

I would rather suggest a kind of 'namespace' thing. This way, one could use the kconfig language for a project (eg. buildroot) and include sub-Kconfig files from other sub-projects (eg. kernel), thus making all configurable from the same menu.

Something like (syntax proposal):

----8<----
mainmenu "Buildroot config system"
option prefix="" <= prefix to config options

config foo => foo=y / # foo is not set
blah blah blah...

namespace "Buildroot options"
option project="Buildroot"
option version="${VERSION}" <= To avoid $VERSION_test ambiguity
option prefix="BR2_" <= prefix to config options

config bar => BR2_bar=y / # BR2_bar is not set
blah blah blah...

endnamespace

namespace "Linux Kernel options"

    option project="Linux"
    option version="..."
    option prefix="CONFIG_"

include "${BR2_KERNEL_DIR}/arch/${BR2_ARCH]/Kconfig"

endnamespace
----8<----

Then with a simple grep -E '^CONFIG_' one can easily extract the kernel options from the others.

We _may_ need to support nested namespaces also, concatenating the prefixes.

I once tried to do such thing, but I'm lacking good lex/yacc fu, and I miserably failed... :-(

Comments?

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +0/33 662376056 | Software  Designer | \ / CAMPAIGN     |   ^                |
| --==< °_° >==-- °------------.-------:  X  AGAINST      |  /e\  There is no  |
| http://ymorin.is-a-geek.org/ | (*_*) | / \ HTML MAIL    |  """  conspiracy.  |
°------------------------------°-------°------------------°--------------------°