b48e35a28a
With this, we can trash our probability patch, it's now upstream. Refresh a few other patches. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
86 lines
2.8 KiB
Diff
86 lines
2.8 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: b/gconf.glade
|
|
===================================================================
|
|
--- a/gconf.glade
|
|
+++ b/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: b/mconf.c
|
|
===================================================================
|
|
--- a/mconf.c
|
|
+++ b/mconf.c
|
|
@@ -178,9 +178,9 @@
|
|
"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> selectes a feature, while <N> will exclude 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 "
|
|
Index: b/zconf.tab.c_shipped
|
|
===================================================================
|
|
--- a/zconf.tab.c_shipped
|
|
+++ b/zconf.tab.c_shipped
|
|
@@ -2297,7 +2297,7 @@
|
|
|
|
sym_init();
|
|
_menu_init();
|
|
- rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
|
|
+ rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL);
|
|
|
|
if (getenv("ZCONF_DEBUG"))
|
|
zconfdebug = 1;
|
|
Index: b/zconf.y
|
|
===================================================================
|
|
--- a/zconf.y
|
|
+++ b/zconf.y
|
|
@@ -493,7 +493,7 @@
|
|
|
|
sym_init();
|
|
_menu_init();
|
|
- rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
|
|
+ rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL);
|
|
|
|
if (getenv("ZCONF_DEBUG"))
|
|
zconfdebug = 1;
|
|
Index: b/confdata.c
|
|
===================================================================
|
|
--- a/confdata.c
|
|
+++ b/confdata.c
|
|
@@ -25,7 +25,7 @@
|
|
static const char *conf_filename;
|
|
static int conf_lineno, conf_warnings, conf_unsaved;
|
|
|
|
-const char conf_defname[] = "arch/$ARCH/defconfig";
|
|
+const char conf_defname[] = ".defconfig";
|
|
|
|
static void conf_warning(const char *fmt, ...)
|
|
{
|
|
@@ -63,7 +63,7 @@
|
|
|
|
const char *conf_get_configname(void)
|
|
{
|
|
- char *name = getenv("KCONFIG_CONFIG");
|
|
+ char *name = getenv("BUILDROOT_CONFIG");
|
|
|
|
return name ? name : ".config";
|
|
}
|