support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch

   1 ---
   2  confdata.c          |    4 ++--
   3  gconf.glade         |    2 +-
   4  mconf.c             |    4 ++--
   5  zconf.tab.c_shipped |    2 +-
   6  zconf.y             |    2 +-
   7  5 files changed, 7 insertions(+), 7 deletions(-)
   8
   9 Index: kconfig/gconf.glade
  10 ===================================================================
  11 --- kconfig.orig/gconf.glade    2013-12-27 22:14:32.395629843 +0100
  12 +++ kconfig/gconf.glade 2013-12-27 22:14:32.387630158 +0100
  13 @@ -4,7 +4,7 @@
  14
  15  <widget class="GtkWindow" id="window1">
  16    <property name="visible">True</property>
  17 -  <property name="title" translatable="yes">Gtk Kernel Configurator</property>
  18 +  <property name="title" translatable="yes">Gtk Buildroot Configurator</property>
  19    <property name="type">GTK_WINDOW_TOPLEVEL</property>
  20    <property name="window_position">GTK_WIN_POS_NONE</property>
  21    <property name="modal">False</property>
  22 Index: kconfig/mconf.c
  23 ===================================================================
  24 --- kconfig.orig/mconf.c        2013-12-27 22:14:32.395629843 +0100
  25 +++ kconfig/mconf.c     2013-12-27 22:14:42.179244153 +0100
  26 @@ -176,9 +176,9 @@
  27         "Arrow keys navigate the menu.  "
  28         "<Enter> selects submenus ---> (or empty submenus ----).  "
  29         "Highlighted letters are hotkeys.  "
  30 -       "Pressing <Y> includes, <N> excludes, <M> modularizes features.  "
  31 +       "Pressing <Y> selectes a feature, while <N> will exclude a feature.  "
  32         "Press <Esc><Esc> to exit, <?> for Help, </> for Search.  "
  33 -       "Legend: [*] built-in  [ ] excluded  <M> module  < > module capable"),
  34 +       "Legend: [*] feature is selected  [ ] feature is excluded"),
  35  radiolist_instructions[] = N_(
  36         "Use the arrow keys to navigate this window or "
  37         "press the hotkey of the item you wish to select "
  38 @@ -959,7 +959,7 @@
  39         if (conf_get_changed())
  40                 res = dialog_yesno(NULL,
  41                                    _("Do you wish to save your new configuration?\n"
  42 -                                    "(Press <ESC><ESC> to continue kernel configuration.)"),
  43 +                                    "(Press <ESC><ESC> to continue Buildroot configuration.)"),
  44                                    6, 60);
  45         else
  46                 res = -1;
  47 Index: kconfig/zconf.tab.c_shipped
  48 ===================================================================
  49 --- kconfig.orig/zconf.tab.c_shipped    2013-12-27 22:14:32.395629843 +0100
  50 +++ kconfig/zconf.tab.c_shipped 2013-12-27 22:14:32.391630000 +0100
  51 @@ -2297,7 +2297,7 @@
  52
  53         sym_init();
  54         _menu_init();
  55 -       rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
  56 +       rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL);
  57
  58         if (getenv("ZCONF_DEBUG"))
  59                 zconfdebug = 1;
  60 Index: kconfig/zconf.y
  61 ===================================================================
  62 --- kconfig.orig/zconf.y        2013-12-27 22:14:32.395629843 +0100
  63 +++ kconfig/zconf.y     2013-12-27 22:14:32.391630000 +0100
  64 @@ -493,7 +493,7 @@
  65
  66         sym_init();
  67         _menu_init();
  68 -       rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
  69 +       rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL);
  70
  71         if (getenv("ZCONF_DEBUG"))
  72                 zconfdebug = 1;
  73 Index: kconfig/confdata.c
  74 ===================================================================
  75 --- kconfig.orig/confdata.c     2013-12-27 22:14:32.395629843 +0100
  76 +++ kconfig/confdata.c  2013-12-27 22:14:32.391630000 +0100
  77 @@ -25,7 +25,7 @@
  78  static const char *conf_filename;
  79  static int conf_lineno, conf_warnings, conf_unsaved;
  80
  81 -const char conf_defname[] = "arch/$ARCH/defconfig";
  82 +const char conf_defname[] = ".defconfig";
  83
  84  static void conf_warning(const char *fmt, ...)
  85  {
  86 @@ -63,7 +63,7 @@
  87
  88  const char *conf_get_configname(void)
  89  {
  90 -       char *name = getenv("KCONFIG_CONFIG");
  91 +       char *name = getenv("BR2_CONFIG");
  92
  93         return name ? name : ".config";
  94  }
  95 Index: kconfig/qconf.cc
  96 ===================================================================
  97 --- kconfig.orig/qconf.cc       2013-12-27 22:12:15.825013567 +0100
  98 +++ kconfig/qconf.cc    2013-12-27 22:14:57.826627300 +0100
  99 @@ -70,7 +70,7 @@
 100  }
 101
 102  ConfigSettings::ConfigSettings()
 103 -       : QSettings("kernel.org", "qconf")
 104 +       : QSettings("buildroot.org", "qconf")
 105  {
 106  }
 107