lkml.org 
[lkml]   [2009]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH resend 09/10] kconfig: do not hardcode ".config" filename
    Date
    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@web.de>
    ---
    scripts/kconfig/conf.c | 7 ++++---
    scripts/kconfig/qconf.cc | 4 ++--
    2 files changed, 6 insertions(+), 5 deletions(-)

    diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
    index d190092..3baaaec 100644
    --- a/scripts/kconfig/conf.c
    +++ b/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 --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
    index 19811fc..ce7d508 100644
    --- a/scripts/kconfig/qconf.cc
    +++ b/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)))
    --
    1.6.3.1.20.ga30f


    \
     
     \ /
      Last update: 2009-05-18 01:43    [W:0.033 / U:31.140 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site