--- Makefile | 2 +- scripts/kconfig/confdata.c | 11 ++++++----- scripts/kconfig/gconf.c | 4 ++-- scripts/kconfig/mconf.c | 5 +++-- scripts/kconfig/qconf.cc | 26 +++++++++++++++++--------- scripts/kconfig/zconf.tab.c_shipped | 6 +++++- 6 files changed, 34 insertions(+), 20 deletions(-) Index: linux-2.6.21/Makefile =================================================================== --- linux-2.6.21.orig/Makefile +++ linux-2.6.21/Makefile @@ -323,7 +323,7 @@ KERNELVERSION = $(VERSION).$(PATCHLEVEL) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION export ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE -export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS +export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS NAME export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE Index: linux-2.6.21/scripts/kconfig/confdata.c =================================================================== --- linux-2.6.21.orig/scripts/kconfig/confdata.c +++ linux-2.6.21/scripts/kconfig/confdata.c @@ -425,10 +425,11 @@ int conf_write(const char *name) fprintf(out, _("#\n" "# Automatically generated make config: don't edit\n" - "# Linux kernel version: %s\n" + "# Linux kernel version: %s \"%s\"\n" "%s%s" "#\n"), sym_get_string_value(sym), + getenv("NAME"), use_timestamp ? "# " : "", use_timestamp ? ctime(&now) : ""); @@ -677,17 +678,17 @@ int conf_write_autoconf(void) time(&now); fprintf(out, "#\n" "# Automatically generated make config: don't edit\n" - "# Linux kernel version: %s\n" + "# Linux kernel version: %s \"%s\"\n" "# %s" "#\n", - sym_get_string_value(sym), ctime(&now)); + sym_get_string_value(sym), getenv("NAME"), ctime(&now)); fprintf(out_h, "/*\n" " * Automatically generated C config: don't edit\n" - " * Linux kernel version: %s\n" + " * Linux kernel version: %s \"%s\"\n" " * %s" " */\n" "#define AUTOCONF_INCLUDED\n", - sym_get_string_value(sym), ctime(&now)); + sym_get_string_value(sym), getenv("NAME"), ctime(&now)); for_all_symbols(i, sym) { sym_calc_value(sym); Index: linux-2.6.21/scripts/kconfig/gconf.c =================================================================== --- linux-2.6.21.orig/scripts/kconfig/gconf.c +++ linux-2.6.21/scripts/kconfig/gconf.c @@ -271,8 +271,8 @@ void init_main_window(const gchar * glad /*"style", PANGO_STYLE_OBLIQUE, */ NULL); - sprintf(title, _("Linux Kernel v%s Configuration"), - getenv("KERNELVERSION")); + sprintf(title, _("Linux Kernel v%s \"%s\" Configuration"), + getenv("KERNELVERSION"), getenv("NAME")); gtk_window_set_title(GTK_WINDOW(main_wnd), title); gtk_widget_show(main_wnd); Index: linux-2.6.21/scripts/kconfig/mconf.c =================================================================== --- linux-2.6.21.orig/scripts/kconfig/mconf.c +++ linux-2.6.21/scripts/kconfig/mconf.c @@ -403,8 +403,9 @@ static void set_config_filename(const ch sym = sym_lookup("KERNELVERSION", 0); sym_calc_value(sym); size = snprintf(menu_backtitle, sizeof(menu_backtitle), - _("%s - Linux Kernel v%s Configuration"), - config_filename, sym_get_string_value(sym)); + _("%s - Linux Kernel v%s \"%s\" Configuration"), + config_filename, sym_get_string_value(sym), + getenv("NAME")); if (size >= sizeof(menu_backtitle)) menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; set_dialog_backtitle(menu_backtitle); Index: linux-2.6.21/scripts/kconfig/qconf.cc =================================================================== --- linux-2.6.21.orig/scripts/kconfig/qconf.cc +++ linux-2.6.21/scripts/kconfig/qconf.cc @@ -1448,14 +1448,14 @@ void ConfigMainWindow::loadConfig(void) if (s.isNull()) return; if (conf_read(QFile::encodeName(s))) - QMessageBox::information(this, "qconf", "Unable to load configuration!"); + QMessageBox::information(this, "QConf Error", "Unable to load configuration!"); ConfigView::updateListAll(); } void ConfigMainWindow::saveConfig(void) { if (conf_write(NULL)) - QMessageBox::information(this, "qconf", "Unable to save configuration!"); + QMessageBox::information(this, "QConf Error", "Unable to save configuration!"); } void ConfigMainWindow::saveConfigAs(void) @@ -1464,7 +1464,7 @@ void ConfigMainWindow::saveConfigAs(void if (s.isNull()) return; if (conf_write(QFile::encodeName(s))) - QMessageBox::information(this, "qconf", "Unable to save configuration!"); + QMessageBox::information(this, "QConf Error", "Unable to save configuration!"); } void ConfigMainWindow::searchConfig(void) @@ -1608,7 +1608,7 @@ void ConfigMainWindow::closeEvent(QClose e->accept(); return; } - QMessageBox mb("qconf", "Save configuration?", QMessageBox::Warning, + QMessageBox mb("Save .config?", "Save configuration?", QMessageBox::Warning, QMessageBox::Yes | QMessageBox::Default, QMessageBox::No, QMessageBox::Cancel | QMessageBox::Escape); mb.setButtonText(QMessageBox::Yes, "&Save Changes"); mb.setButtonText(QMessageBox::No, "&Discard Changes"); @@ -1627,7 +1627,8 @@ void ConfigMainWindow::closeEvent(QClose void ConfigMainWindow::showIntro(void) { - static char str[] = "Welcome to the qconf graphical kernel configuration tool for Linux.\n\n" + static char str[1000]; + sprintf(str, "Welcome to the qconf graphical kernel configuration tool for Linux %s \"%s\".\n\n" "For each option, a blank box indicates the feature is disabled, a check\n" "indicates it is enabled, and a dot indicates that it is to be compiled\n" "as a module. Clicking on the box will cycle through the three states.\n\n" @@ -1637,9 +1638,10 @@ void ConfigMainWindow::showIntro(void) "options must be enabled to support the option you are interested in, you can\n" "still view the help of a grayed-out option.\n\n" "Toggling Show Debug Info under the Options menu will show the dependencies,\n" - "which you can then match by examining other options.\n\n"; + "which you can then match by examining other options.\n\n", + getenv("KERNELRELEASE"), getenv("NAME")); - QMessageBox::information(this, "qconf", str); + QMessageBox::information(this, "Introduction", str); } void ConfigMainWindow::showAbout(void) @@ -1647,7 +1649,7 @@ void ConfigMainWindow::showAbout(void) static char str[] = "qconf is Copyright (C) 2002 Roman Zippel .\n\n" "Bug reports and feature request can also be entered at http://bugzilla.kernel.org/\n"; - QMessageBox::information(this, "qconf", str); + QMessageBox::information(this, "About", str); } void ConfigMainWindow::saveSettings(void) @@ -1711,7 +1713,12 @@ int main(int ac, char** av) { ConfigMainWindow* v; const char *name; - + static char title[100]; + + sprintf(title,"Linux Kernel %s \"%s\" Configuration", + getenv("KERNELRELEASE"), getenv("NAME") + ); + bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); @@ -1742,6 +1749,7 @@ int main(int ac, char** av) configSettings->beginGroup("/kconfig/qconf"); v = new ConfigMainWindow(); + v->setCaption(title); //zconfdump(stdout); configApp->setMainWidget(v); configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit())); Index: linux-2.6.21/scripts/kconfig/zconf.tab.c_shipped =================================================================== --- linux-2.6.21.orig/scripts/kconfig/zconf.tab.c_shipped +++ linux-2.6.21/scripts/kconfig/zconf.tab.c_shipped @@ -2107,15 +2107,19 @@ void conf_parse(const char *name) { struct symbol *sym; int i; + static char title[200]; zconf_initscan(name); + + sprintf(title,"Linux Kernel %s \"%s\" Configuration", + getenv("KERNELRELEASE"), getenv("NAME")); sym_init(); menu_init(); modules_sym = sym_lookup(NULL, 0); modules_sym->type = S_BOOLEAN; modules_sym->flags |= SYMBOL_AUTO; - rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); + rootmenu.prompt = menu_add_prompt(P_MENU, title, NULL); #if YYDEBUG if (getenv("ZCONF_DEBUG"))