01-kconfig-kernel-to-buildroot.patch 3.9 KB

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