| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <200705240117.39800.vapier@gentoo.org>
Date: Thu, 24 May 2007 01:17:39 -0400
From: Mike Frysinger <vapier@...too.org>
To: sam@...nborg.org
Cc: linux-kernel@...r.kernel.org, kbuild-devel@...ts.sourceforge.net
Subject: [rfe] easier customization of kconfig for non-Linux projects
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.
Signed-off-by: Mike Frysinger <vapier@...too.org>
---
--- a/scripts/kconfig/lkc_local.h
+++ b/scripts/kconfig/lkc_local.h
@@ -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
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 1199baf..a5f5102 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -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;
}
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 664fe29..06366ed 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -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) {
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 61d8166..ba62d64 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -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);
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 8a07ee4..e694cda 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -6,6 +6,8 @@
#ifndef LKC_H
#define LKC_H
+#include "lkc_local.h"
+
#include "expr.h"
#ifndef KBUILD_NO_NLS
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index d0e4fa5..344f777 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -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:
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index c35dcc5..004b7df 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -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);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists