The patch titled kconfig: do not hardcode ".config" filename has been added to the -mm tree. Its filename is kconfig-do-not-hardcode-config-filename.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: kconfig: do not hardcode ".config" filename From: Markus Heidelberg <markus.heidelberg@xxxxxx> Rather than hardcoding ".config" use conf_get_configname(), which also respects the environment variable KCONFIG_CONFIG. This fixes "make silentoldconfig" when KCONFIG_CONFIG is used and also suggests the given filename for "Load" and "Save as" in qconf. Signed-off-by: Markus Heidelberg <markus.heidelberg@xxxxxx> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/kconfig/conf.c | 7 ++++--- scripts/kconfig/qconf.cc | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff -puN scripts/kconfig/conf.c~kconfig-do-not-hardcode-config-filename scripts/kconfig/conf.c --- a/scripts/kconfig/conf.c~kconfig-do-not-hardcode-config-filename +++ a/scripts/kconfig/conf.c @@ -498,14 +498,15 @@ int main(int ac, char **av) conf_parse(name); //zconfdump(stdout); if (sync_kconfig) { - if (stat(".config", &tmpstat)) { + name = conf_get_configname(); + if (stat(name, &tmpstat)) { fprintf(stderr, _("***\n" "*** You have not yet configured your kernel!\n" - "*** (missing kernel .config file)\n" + "*** (missing kernel config file \"%s\")\n" "***\n" "*** Please run some configurator (e.g. \"make oldconfig\" or\n" "*** \"make menuconfig\" or \"make xconfig\").\n" - "***\n")); + "***\n"), name); exit(1); } } diff -puN scripts/kconfig/qconf.cc~kconfig-do-not-hardcode-config-filename scripts/kconfig/qconf.cc --- a/scripts/kconfig/qconf.cc~kconfig-do-not-hardcode-config-filename +++ a/scripts/kconfig/qconf.cc @@ -1448,7 +1448,7 @@ ConfigMainWindow::ConfigMainWindow(void) void ConfigMainWindow::loadConfig(void) { - QString s = QFileDialog::getOpenFileName(".config", NULL, this); + QString s = QFileDialog::getOpenFileName(conf_get_configname(), NULL, this); if (s.isNull()) return; if (conf_read(QFile::encodeName(s))) @@ -1464,7 +1464,7 @@ void ConfigMainWindow::saveConfig(void) void ConfigMainWindow::saveConfigAs(void) { - QString s = QFileDialog::getSaveFileName(".config", NULL, this); + QString s = QFileDialog::getSaveFileName(conf_get_configname(), NULL, this); if (s.isNull()) return; if (conf_write(QFile::encodeName(s))) _ Patches currently in -mm which might be from markus.heidelberg@xxxxxx are kconfig-fix-typo-mconfig-to-menuconfig-in-a-comment.patch kconfig-add-a-note-about-the-deps-to-the-silentoldconfig-help.patch kconfig-resort-the-documentation-of-the-environment-variables.patch gitignore-ignore-kconfig-i18n-files.patch kconfig-qconf-fix-wall-compiler-warnings.patch kconfig-qconf-fix-namespace-for-horizontal-and-vertical-enum-values.patch kconfig-qconf-add-namespace-for-use-of-key_-enum-values.patch kconfig-qconf-fix-the-type-of-the-desktop-widget.patch kconfig-do-not-hardcode-config-filename.patch kconfig-do-not-hardcode-include-config-autoconf-filename.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html