support/kconfig: fix reference to kernel
PATCH 1/1 support/kconfig: fix reference to kernel
There was some references to the kernel missed by
01-kconfig-kernel-to-buildroot.patch
This patch also update kconfig to the one used in 3.13-rc5. The changes are really minor.
--- support/kconfig/README.buildroot | 2 +- support/kconfig/expr.h | 2 +- support/kconfig/mconf.c | 62 +++++++++++----------- support/kconfig/menu.c | 11 ++-- .../patches/01-kconfig-kernel-to-buildroot.patch | 54 +++++++++++++------ support/kconfig/qconf.cc | 5 ++ support/kconfig/qconf.h | 1 + support/kconfig/symbol.c | 2 +- support/kconfig/zconf.l | 1 - 9 files changed, 83 insertions(+), 57 deletions(-)
support/kconfig/README.buildroot +1 -1
@@ -1,4 +1,4 @@ -This is a copy of the kconfig code in the kernel (currently 3.9-rc2) tweaked +This is a copy of the kconfig code in the kernel (currently 3.13-rc5) tweaked to suit Buildroot. To update:
support/kconfig/expr.h +1 -1
@@ -93,7 +93,7 @@ struct symbol {#define SYMBOL_CHOICEVAL 0x0020/* used as a value in a choice block */ #define SYMBOL_VALID 0x0080/* set when symbol.curr is calculated */ #define SYMBOL_OPTIONAL 0x0100/* choice is optional - values can be 'n' */ -#define SYMBOL_WRITE 0x0200/* ? */ +#define SYMBOL_WRITE 0x0200/* write symbol to file (KCONFIG_CONFIG) */ #define SYMBOL_CHANGED 0x0400/* ? */ #define SYMBOL_AUTO 0x1000/* value from environment variable */ #define SYMBOL_CHECKED 0x2000/* used during dependency checking */
support/kconfig/mconf.c +30 -32
144 lines not on this page · raw message
support/kconfig/menu.c +6 -5
@@ -119,9 +119,10 @@ void menu_set_type(int type) sym->type = type;return ; } -menu_warn (current_entry,"type of '%s' redefined from '%s' to '%s'" , - sym->name ? sym->name :"<choice>" , -sym_type_name (sym->type),sym_type_name (type)); +menu_warn (current_entry, +"ignoring type redefinition of '%s' from '%s' to '%s'" , + sym->name ? sym->name :"<choice>" , +sym_type_name (sym->type),sym_type_name (type)); }struct property *menu_add_prop (enum prop_type type,char *prompt,struct expr *expr,struct expr *dep)
@@ -583,7 +584,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,for (j =4 ; --i >=0 ; j +=2 ) { menu = submenu[i];if (head && location && menu == location) - jump->offset = r->len -1 ; + jump->offset =strlen (r->s);str_printf (r,"%*c-> %s" , j,' ' ,_ (menu_get_prompt (menu)));if (menu->sym) {
@@ -597,7 +598,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, }/* -* get peoperty of type P_SYMBOL +* get property of type P_SYMBOL */ static struct property *get_symbol_prop (struct symbol *sym) {
support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch +38 -16
92 lines not on this page · raw message
support/kconfig/qconf.cc +5 -0
@@ -69,6 +69,11 @@ static inline QString qgettext(const QString& str) return QString::fromLocal8Bit(gettext(str.latin1())); } +ConfigSettings::ConfigSettings() + : QSettings("buildroot.org", "qconf") +{ +} + /** * Reads a list of integer values from the application settings. */
support/kconfig/qconf.h +1 -0
@@ -32,6 +32,7 @@ class ConfigMainWindow; class ConfigSettings : public QSettings { public: +ConfigSettings (); Q3ValueList<int> readSizes(const QString& key, bool *ok); bool writeSizes(const QString& key, const Q3ValueList<int>& value); };
support/kconfig/symbol.c +1 -1
@@ -1047,7 +1047,7 @@ sym_re_search_free:* When we check for recursive dependencies we use a stack to save * current state so we can print out relevant info to user. * The entries are located on the call stack so no need to free memory. -* Note inser() remove() must always match to properly clear the stack. +* Note insert() remove() must always match to properly clear the stack. */ static struct dep_stack { struct dep_stack *prev, *next;
support/kconfig/zconf.l +0 -1
@@ -68,7 +68,6 @@ static void alloc_string(const char *str, int size) } %} -ws [ \n\t] n [A-Za-z0-9_] %%
Signature · 1 line
1.8.5.1
PATCH 1/2 support/kconfig: Update kconfig to 3.13-rc5
Only minor changes are registered, mainly help text.
--- support/kconfig/README.buildroot | 2 +- support/kconfig/expr.h | 2 +- support/kconfig/mconf.c | 60 +++++++++++++++++++--------------------- support/kconfig/menu.c | 11 ++++---- support/kconfig/qconf.cc | 5 ++++ support/kconfig/qconf.h | 1 + support/kconfig/symbol.c | 2 +- support/kconfig/zconf.l | 1 - 8 files changed, 44 insertions(+), 40 deletions(-)
support/kconfig/README.buildroot +1 -1
@@ -1,4 +1,4 @@ -This is a copy of the kconfig code in the kernel (currently 3.9-rc2) tweaked +This is a copy of the kconfig code in the kernel (currently 3.13-rc5) tweaked to suit Buildroot. To update:
support/kconfig/expr.h +1 -1
@@ -93,7 +93,7 @@ struct symbol {#define SYMBOL_CHOICEVAL 0x0020/* used as a value in a choice block */ #define SYMBOL_VALID 0x0080/* set when symbol.curr is calculated */ #define SYMBOL_OPTIONAL 0x0100/* choice is optional - values can be 'n' */ -#define SYMBOL_WRITE 0x0200/* ? */ +#define SYMBOL_WRITE 0x0200/* write symbol to file (KCONFIG_CONFIG) */ #define SYMBOL_CHANGED 0x0400/* ? */ #define SYMBOL_AUTO 0x1000/* value from environment variable */ #define SYMBOL_CHECKED 0x2000/* used during dependency checking */
support/kconfig/mconf.c +29 -31
136 lines not on this page · raw message
support/kconfig/menu.c +6 -5
@@ -119,9 +119,10 @@ void menu_set_type(int type) sym->type = type;return ; } -menu_warn (current_entry,"type of '%s' redefined from '%s' to '%s'" , - sym->name ? sym->name :"<choice>" , -sym_type_name (sym->type),sym_type_name (type)); +menu_warn (current_entry, +"ignoring type redefinition of '%s' from '%s' to '%s'" , + sym->name ? sym->name :"<choice>" , +sym_type_name (sym->type),sym_type_name (type)); }struct property *menu_add_prop (enum prop_type type,char *prompt,struct expr *expr,struct expr *dep)
@@ -583,7 +584,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,for (j =4 ; --i >=0 ; j +=2 ) { menu = submenu[i];if (head && location && menu == location) - jump->offset = r->len -1 ; + jump->offset =strlen (r->s);str_printf (r,"%*c-> %s" , j,' ' ,_ (menu_get_prompt (menu)));if (menu->sym) {
@@ -597,7 +598,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, }/* -* get peoperty of type P_SYMBOL +* get property of type P_SYMBOL */ static struct property *get_symbol_prop (struct symbol *sym) {
support/kconfig/qconf.cc +5 -0
@@ -69,6 +69,11 @@ static inline QString qgettext(const QString& str) return QString::fromLocal8Bit(gettext(str.latin1())); } +ConfigSettings::ConfigSettings() + : QSettings("kernel.org", "qconf") +{ +} + /** * Reads a list of integer values from the application settings. */
support/kconfig/qconf.h +1 -0
@@ -32,6 +32,7 @@ class ConfigMainWindow; class ConfigSettings : public QSettings { public: +ConfigSettings (); Q3ValueList<int> readSizes(const QString& key, bool *ok); bool writeSizes(const QString& key, const Q3ValueList<int>& value); };
support/kconfig/symbol.c +1 -1
@@ -1047,7 +1047,7 @@ sym_re_search_free:* When we check for recursive dependencies we use a stack to save * current state so we can print out relevant info to user. * The entries are located on the call stack so no need to free memory. -* Note inser() remove() must always match to properly clear the stack. +* Note insert() remove() must always match to properly clear the stack. */ static struct dep_stack { struct dep_stack *prev, *next;
support/kconfig/zconf.l +0 -1
@@ -68,7 +68,6 @@ static void alloc_string(const char *str, int size) } %} -ws [ \n\t] n [A-Za-z0-9_] %%
Signature · 1 line
1.8.5.1
PATCH 1/2 support/kconfig: Update kconfig to 3.13-rc5
Dear Maxime Hadjinlian,
Quoted 13 lines · Maxime Hadjinlian
Only minor changes are registered, mainly help text.
Signed-off-by Maxime Hadjinlian <[email protected]>--- support/kconfig/README.buildroot | 2 +- support/kconfig/expr.h | 2 +- support/kconfig/mconf.c | 60 +++++++++++++++++++--------------------- support/kconfig/menu.c | 11 ++++---- support/kconfig/qconf.cc | 5 ++++ support/kconfig/qconf.h | 1 + support/kconfig/symbol.c | 2 +- support/kconfig/zconf.l | 1 - 8 files changed, 44 insertions(+), 40 deletions(-)
Thanks, both patches 1/2 and 2/2 applied. I've ignored the two patches you had sent which had both changes combined into one.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 2/2 support/kconfig: Fix remaining 'kernel' mention
In reply to Maxime HadjinlianThis patch update the patch for kernel's kconfig to add remaining 'kernel' mention.
It also applies this patch to buildroot's kconfig.
--- support/kconfig/mconf.c | 2 +- .../patches/01-kconfig-kernel-to-buildroot.patch | 54 +++++++++++++++------- support/kconfig/qconf.cc | 2 +- 3 files changed, 40 insertions(+), 18 deletions(-)
support/kconfig/mconf.c +1 -1
@@ -959,7 +959,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 ;
support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch +38 -16
92 lines not on this page · raw message
support/kconfig/qconf.cc +1 -1
@@ -70,7 +70,7 @@ static inline QString qgettext(const QString& str) } ConfigSettings::ConfigSettings() - : QSettings("kernel.org", "qconf") + : QSettings("buildroot.org", "qconf") { }
Signature · 1 line
1.8.5.1