108 lines
3.7 KiB
Diff
108 lines
3.7 KiB
Diff
|
---
|
||
|
|
confdata.c | 4 ++--
|
||
|
|
gconf.glade | 2 +-
|
||
|
|
mconf.c | 4 ++--
|
||
|
|
zconf.tab.c_shipped | 2 +-
|
||
|
|
zconf.y | 2 +-
|
||
|
|
5 files changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
Index: kconfig/gconf.glade
|
||
|
|
===================================================================
|
||
|
|
--- kconfig.orig/gconf.glade
|
||
|
|
+++ kconfig/gconf.glade
|
||
|
|
@@ -4,7 +4,7 @@
|
||
|
|
|
||
|
|
<widget class="GtkWindow" id="window1">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
- <property name="title" translatable="yes">Gtk Kernel Configurator</property>
|
||
|
|
+ <property name="title" translatable="yes">Gtk Buildroot Configurator</property>
|
||
|
|
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||
|
|
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||
|
|
<property name="modal">False</property>
|
||
|
|
Index: kconfig/mconf.c
|
||
|
|
===================================================================
|
||
|
|
--- kconfig.orig/mconf.c
|
||
|
|
+++ kconfig/mconf.c
|
||
|
|
@@ -176,9 +176,9 @@ menu_instructions[] = N_(
|
||
|
|
"Arrow keys navigate the menu. "
|
||
|
|
"<Enter> selects submenus ---> (or empty submenus ----). "
|
||
|
|
"Highlighted letters are hotkeys. "
|
||
|
|
- "Pressing <Y> includes, <N> excludes, <M> modularizes features. "
|
||
|
|
+ "Pressing <Y> selects a feature, while <N> excludes a feature. "
|
||
|
|
"Press <Esc><Esc> to exit, <?> for Help, </> for Search. "
|
||
|
|
- "Legend: [*] built-in [ ] excluded <M> module < > module capable"),
|
||
|
|
+ "Legend: [*] feature is selected [ ] feature is excluded"),
|
||
|
|
radiolist_instructions[] = N_(
|
||
|
|
"Use the arrow keys to navigate this window or "
|
||
|
|
"press the hotkey of the item you wish to select "
|
||
|
|
@@ -962,7 +962,7 @@ static int handle_exit(void)
|
||
|
|
if (conf_get_changed())
|
||
|
|
res = dialog_yesno(NULL,
|
||
|
|
_("Do you wish to save your new configuration?\n"
|
||
|
|
- "(Press <ESC><ESC> to continue kernel configuration.)"),
|
||
|
|
+ "(Press <ESC><ESC> to continue Buildroot configuration.)"),
|
||
|
|
6, 60);
|
||
|
|
else
|
||
|
|
res = -1;
|
||
|
|
Index: kconfig/zconf.tab.c_shipped
|
||
|
|
===================================================================
|
||
|
|
--- kconfig.orig/zconf.tab.c_shipped
|
||
|
|
+++ kconfig/zconf.tab.c_shipped
|
||
|
|
@@ -1515,7 +1515,7 @@ yyreduce:
|
||
|
|
* later regardless of whether it comes from the 'prompt' in
|
||
|
|
* mainmenu_stmt or here
|
||
|
|
*/
|
||
|
|
- menu_add_prompt(P_MENU, xstrdup("Linux Kernel Configuration"), NULL);
|
||
|
|
+ menu_add_prompt(P_MENU, xstrdup("Buildroot Configuration"), NULL);
|
||
|
|
}
|
||
|
|
|
||
|
|
break;
|
||
|
|
Index: kconfig/zconf.y
|
||
|
|
===================================================================
|
||
|
|
--- kconfig.orig/zconf.y
|
||
|
|
+++ kconfig/zconf.y
|
||
|
|
@@ -127,7 +127,7 @@ no_mainmenu_stmt: /* empty */
|
||
|
|
* later regardless of whether it comes from the 'prompt' in
|
||
|
|
* mainmenu_stmt or here
|
||
|
|
*/
|
||
|
|
- menu_add_prompt(P_MENU, xstrdup("Linux Kernel Configuration"), NULL);
|
||
|
|
+ menu_add_prompt(P_MENU, xstrdup("Buildroot Configuration"), NULL);
|
||
|
|
};
|
||
|
|
|
||
|
|
|
||
|
|
Index: kconfig/confdata.c
|
||
|
|
===================================================================
|
||
|
|
--- kconfig.orig/confdata.c
|
||
|
|
+++ kconfig/confdata.c
|
||
|
|
@@ -30,7 +30,7 @@ static void conf_message(const char *fmt
|
||
|
|
static const char *conf_filename;
|
||
|
|
static int conf_lineno, conf_warnings;
|
||
|
|
|
||
|
|
-const char conf_defname[] = "arch/$ARCH/defconfig";
|
||
|
|
+const char conf_defname[] = ".defconfig";
|
||
|
|
|
||
|
|
static void conf_warning(const char *fmt, ...)
|
||
|
|
{
|
||
|
|
@@ -69,7 +69,7 @@ static void conf_message(const char *fmt
|
||
|
|
|
||
|
|
const char *conf_get_configname(void)
|
||
|
|
{
|
||
|
|
- char *name = getenv("KCONFIG_CONFIG");
|
||
|
|
+ char *name = getenv("BR2_CONFIG");
|
||
|
|
|
||
|
|
return name ? name : ".config";
|
||
|
|
}
|
||
|
|
Index: kconfig/qconf.cc
|
||
|
|
===================================================================
|
||
|
|
--- kconfig.orig/qconf.cc
|
||
|
|
+++ kconfig/qconf.cc
|
||
|
|
@@ -55,7 +55,7 @@ static inline QString qgettext(const QSt
|
||
|
|
}
|
||
|
|
|
||
|
|
ConfigSettings::ConfigSettings()
|
||
|
|
- : QSettings("kernel.org", "qconf")
|
||
|
|
+ : QSettings("buildroot.org", "qconf")
|
||
|
|
{
|
||
|
|
}
|
||
|
|
|