Pull request for branch yem/kconfig
From: "Yann E. MORIN" <[email protected]>
Hello All!
While I was at it to fix the kconfig space-can't-deselect issue, I decided to go a bit further, and update and clean up our kconfig.
So here is this series for 'next'.
Note that we ditch two of our patches: one because it is useless (C++-style comments), one because it's been upstreamed (probability). Also, the README was updated to also include copying of .gitignore, which was missing so far.
Regards,
Yann E. MORIN.
The following changes since commit c09f5aaa0f342d0fbfc12a6d8f4b704fab55f400:
docs/download.html: Fix tarball typos (2013-11-13 21:41:04 +0100)
are available in the git repository at:
git://gitorious.org/buildroot/buildroot.git yem/kconfig
for you to fetch changes up to eabc0ac6fc62b091a78c1f78a987fbe3962e0c95:
support/kconfig: bump to kconfig from linux-3.12 (2013-11-14 00:49:01 +0100)
----------------------------------------------------------------
Yann E. MORIN (4):
support/kconfig: fix 'space' to (de)select options support/kconfig: update our README support/kconfig: remove useless patch support/kconfig: bump to kconfig from linux-3.12
support/kconfig/Makefile | 4 +- support/kconfig/README.buildroot | 2 +- support/kconfig/conf.c | 16 +- support/kconfig/confdata.c | 111 +++- support/kconfig/expr.c | 42 +- support/kconfig/expr.h | 3 + support/kconfig/list.h | 40 ++ support/kconfig/lkc.h | 3 +- support/kconfig/lkc_proto.h | 1 + support/kconfig/lxdialog/check-lxdialog.sh | 6 +- support/kconfig/lxdialog/checklist.c | 8 +- support/kconfig/lxdialog/dialog.h | 21 + support/kconfig/lxdialog/inputbox.c | 8 +- support/kconfig/lxdialog/menubox.c | 17 +- support/kconfig/lxdialog/textbox.c | 6 +- support/kconfig/lxdialog/util.c | 85 +++- support/kconfig/lxdialog/yesno.c | 8 +- support/kconfig/mconf.c | 108 +++- support/kconfig/menu.c | 73 ++- support/kconfig/merge_config.sh | 10 +- support/kconfig/nconf.c | 41 +- support/kconfig/nconf.gui.c | 20 +- .../patches/01-kconfig-kernel-to-buildroot.patch | 22 +- .../patches/02-cpp-comments-to-c-comments.patch | 178 ------- .../patches/09-implement-kconfig-probability.patch | 44 -- .../patches/11-use-mktemp-for-lxdialog.patch | 2 +- .../patches/14-support-out-of-tree-config.patch | 14 +- .../kconfig/patches/15-fix-qconf-moc-rule.patch | 2 +- .../16-fix-space-to-de-select-options.patch | 41 ++ support/kconfig/patches/series | 3 +- support/kconfig/streamline_config.pl | 26 +- support/kconfig/symbol.c | 103 +++- support/kconfig/zconf.tab.c_shipped | 562 +++++++++++---------- support/kconfig/zconf.y | 11 +- 34 files changed, 944 insertions(+), 697 deletions(-) delete mode 100644 support/kconfig/patches/02-cpp-comments-to-c-comments.patch delete mode 100644 support/kconfig/patches/09-implement-kconfig-probability.patch create mode 100644 support/kconfig/patches/16-fix-space-to-de-select-options.patch
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/4 support/kconfig: fix 'space' to (de)select options
From: "Yann E. MORIN" <[email protected]>
In case a menu has comment without letters/numbers (eg. characters matching the regexp '^[^[:alpha:][:digit:]]+$', for example - or *), hitting space will cycle through those comments, rather than selecting/deselecting the currently-highlighted option.
This is the behaviour of hitting any letter/digit: jump to the next option which prompt starts with that letter. The only letters that do not behave as such are 'y' 'm' and 'n'. Prompts that start with one of those three letters are instead matched on the first letter that is not 'y', 'm' or 'n'.
Fix that by treating 'space' as we treat y/m/n, ie. as an action key, not as shortcut to jump to prompt.
---
Note: I'll be running this upstream soonish.
Changes v1 -> v2:
- add this to our patch series (Thomas)
--- support/kconfig/lxdialog/menubox.c | 2 +- .../16-fix-space-to-de-select-options.patch | 41 ++++++++++++++++++++++ support/kconfig/patches/series | 1 + 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 support/kconfig/patches/16-fix-space-to-de-select-options.patch
support/kconfig/lxdialog/menubox.c +1 -1
@@ -285,7 +285,7 @@ do_resize:if (key <256 &&isalpha (key)) key =tolower (key); -if (strchr ("ynmh" , key)) +if (strchr ("ynmh " , key)) i = max_choice;else {for (i = choice +1 ; i < max_choice; i++) {
support/kconfig/patches/16-fix-space-to-de-select-options.patch new file +41 -0
41 lines not on this page · raw message
support/kconfig/patches/series +1 -0
@@ -7,3 +7,4 @@ 12-fix-glade-file-path.patch 14-support-out-of-tree-config.patch 15-fix-qconf-moc-rule.patch +16-fix-space-to-de-select-options.patch
Signature · 1 line
1.8.1.2
PATCH 2/4 support/kconfig: update our README
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
The procedure to update our copy of kconfig was mising copying a file.
--- support/kconfig/README.buildroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
support/kconfig/README.buildroot +1 -1
@@ -4,7 +4,7 @@ to suit Buildroot. To update: cp -r /usr/src/linux/scripts/kconfig support/kconfig.new cd support/kconfig.new - cp -a ../kconfig/patches ../kconfig/README.buildroot . + cp -a ../kconfig/patches ../kconfig/README.buildroot ../kconfig/.gitignore . quilt push -a # Fix any conflict cd ..
Signature · 1 line
1.8.1.2
PATCH 3/4 support/kconfig: remove useless patch
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Patches 02-cpp-comments-to-c-comments.patch changes C++-style comments into C-style comments.
This is unneeded, since gcc accepts C++-style comments in C code anyway.
Ditch that patch, that's one less we have to handle when updating from upstream.
--- support/kconfig/expr.c | 42 ++--- .../patches/02-cpp-comments-to-c-comments.patch | 178 --------------------- support/kconfig/patches/series | 1 - 3 files changed, 21 insertions(+), 200 deletions(-) delete mode 100644 support/kconfig/patches/02-cpp-comments-to-c-comments.patch
support/kconfig/expr.c +21 -21
@@ -326,7 +326,7 @@ struct expr *expr_trans_bool(struct expr *e) e->right.expr =expr_trans_bool (e->right.expr);break ;case E_UNEQUAL : -/* FOO!=n -> FOO */ +// FOO!=n -> FOO if (e->left.sym->type ==S_TRISTATE ) {if (e->right.sym == &symbol_no) { e->type =E_SYMBOL ;
@@ -375,19 +375,19 @@ static struct expr *expr_join_or(struct expr *e1, struct expr *e2)if (e1->type ==E_EQUAL && e2->type ==E_EQUAL && ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) || (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes))) { -/* (a='y') || (a='m') -> (a!='n') */ +// (a='y') || (a='m') -> (a!='n') return expr_alloc_comp (E_UNEQUAL , sym1, &symbol_no); }if (e1->type ==E_EQUAL && e2->type ==E_EQUAL && ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) || (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes))) { -/* (a='y') || (a='n') -> (a!='m') */ +// (a='y') || (a='n') -> (a!='m') return expr_alloc_comp (E_UNEQUAL , sym1, &symbol_mod); }if (e1->type ==E_EQUAL && e2->type ==E_EQUAL && ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) || (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod))) { -/* (a='m') || (a='n') -> (a!='y') */ +// (a='m') || (a='n') -> (a!='y') return expr_alloc_comp (E_UNEQUAL , sym1, &symbol_yes); } }
@@ -438,29 +438,29 @@ static struct expr *expr_join_and(struct expr *e1, struct expr *e2)if ((e1->type ==E_SYMBOL && e2->type ==E_EQUAL && e2->right.sym == &symbol_yes) || (e2->type ==E_SYMBOL && e1->type ==E_EQUAL && e1->right.sym == &symbol_yes)) -/* (a) && (a='y') -> (a='y') */ +// (a) && (a='y') -> (a='y') return expr_alloc_comp (E_EQUAL , sym1, &symbol_yes);if ((e1->type ==E_SYMBOL && e2->type ==E_UNEQUAL && e2->right.sym == &symbol_no) || (e2->type ==E_SYMBOL && e1->type ==E_UNEQUAL && e1->right.sym == &symbol_no)) -/* (a) && (a!='n') -> (a) */ +// (a) && (a!='n') -> (a) return expr_alloc_symbol (sym1);if ((e1->type ==E_SYMBOL && e2->type ==E_UNEQUAL && e2->right.sym == &symbol_mod) || (e2->type ==E_SYMBOL && e1->type ==E_UNEQUAL && e1->right.sym == &symbol_mod)) -/* (a) && (a!='m') -> (a='y') */ +// (a) && (a!='m') -> (a='y') return expr_alloc_comp (E_EQUAL , sym1, &symbol_yes);if (sym1->type ==S_TRISTATE ) {if (e1->type ==E_EQUAL && e2->type ==E_UNEQUAL ) { -/* (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' */ +// (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' sym2 = e1->right.sym;if ((e2->right.sym->flags &SYMBOL_CONST ) && (sym2->flags &SYMBOL_CONST ))return sym2 != e2->right.sym ?expr_alloc_comp (E_EQUAL , sym1, sym2) :expr_alloc_symbol (&symbol_no); }if (e1->type ==E_UNEQUAL && e2->type ==E_EQUAL ) { -/* (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' */ +// (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' sym2 = e2->right.sym;if ((e1->right.sym->flags &SYMBOL_CONST ) && (sym2->flags &SYMBOL_CONST )) return sym2 != e1->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
@@ -469,19 +469,19 @@ static struct expr *expr_join_and(struct expr *e1, struct expr *e2)if (e1->type ==E_UNEQUAL && e2->type ==E_UNEQUAL && ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) || (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes))) -/* (a!='y') && (a!='n') -> (a='m') */ +// (a!='y') && (a!='n') -> (a='m') return expr_alloc_comp (E_EQUAL , sym1, &symbol_mod);if (e1->type ==E_UNEQUAL && e2->type ==E_UNEQUAL && ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) || (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes))) -/* (a!='y') && (a!='m') -> (a='n') */ +// (a!='y') && (a!='m') -> (a='n') return expr_alloc_comp (E_EQUAL , sym1, &symbol_no);if (e1->type ==E_UNEQUAL && e2->type ==E_UNEQUAL && ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) || (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod))) -/* (a!='m') && (a!='n') -> (a='m') */ +// (a!='m') && (a!='n') -> (a='m') return expr_alloc_comp (E_EQUAL , sym1, &symbol_yes); if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_mod) ||
@@ -574,7 +574,7 @@ static void expr_eliminate_dups2(enum expr_type type, struct expr **ep1, structswitch (e1->type) {case E_OR :expr_eliminate_dups2 (e1->type, &e1, &e1); -/* (FOO || BAR) && (!FOO && !BAR) -> n */ +// (FOO || BAR) && (!FOO && !BAR) -> n tmp1 =expr_transform (expr_alloc_one (E_NOT ,expr_copy (e1))); tmp2 =expr_copy (e2); tmp =expr_extract_eq_and (&tmp1, &tmp2);
@@ -589,7 +589,7 @@ static void expr_eliminate_dups2(enum expr_type type, struct expr **ep1, structbreak ;case E_AND :expr_eliminate_dups2 (e1->type, &e1, &e1); -/* (FOO && BAR) || (!FOO || !BAR) -> y */ +// (FOO && BAR) || (!FOO || !BAR) -> y tmp1 =expr_transform (expr_alloc_one (E_NOT ,expr_copy (e1))); tmp2 =expr_copy (e2); tmp =expr_extract_eq_or (&tmp1, &tmp2);
@@ -698,7 +698,7 @@ struct expr *expr_transform(struct expr *e)case E_NOT :switch (e->left.expr->type) {case E_NOT : -/* !!a -> a */ +// !!a -> a tmp = e->left.expr->left.expr;free (e->left.expr);free (e);
@@ -707,14 +707,14 @@ struct expr *expr_transform(struct expr *e)break ;case E_EQUAL :case E_UNEQUAL : -/* !a='x' -> a!='x' */ +// !a='x' -> a!='x' tmp = e->left.expr;free (e); e = tmp; e->type = e->type ==E_EQUAL ?E_UNEQUAL :E_EQUAL ;break ;case E_OR : -/* !(a || b) -> !a && !b */ +// !(a || b) -> !a && !b tmp = e->left.expr; e->type =E_AND ; e->right.expr =expr_alloc_one (E_NOT , tmp->right.expr);
@@ -723,7 +723,7 @@ struct expr *expr_transform(struct expr *e) e =expr_transform (e);break ;case E_AND : -/* !(a && b) -> !a || !b */ +// !(a && b) -> !a || !b tmp = e->left.expr; e->type =E_OR ; e->right.expr =expr_alloc_one (E_NOT , tmp->right.expr);
@@ -733,7 +733,7 @@ struct expr *expr_transform(struct expr *e)break ;case E_SYMBOL :if (e->left.expr->left.sym == &symbol_yes) { -/* !'y' -> 'n' */ +// !'y' -> 'n' tmp = e->left.expr;free (e); e = tmp;
@@ -742,7 +742,7 @@ struct expr *expr_transform(struct expr *e)break ; }if (e->left.expr->left.sym == &symbol_mod) { -/* !'m' -> 'm' */ +// !'m' -> 'm' tmp = e->left.expr;free (e); e = tmp;
@@ -751,7 +751,7 @@ struct expr *expr_transform(struct expr *e)break ; }if (e->left.expr->left.sym == &symbol_no) { -/* !'n' -> 'y' */ +// !'n' -> 'y' tmp = e->left.expr;free (e); e = tmp;
support/kconfig/patches/02-cpp-comments-to-c-comments.patch deleted +0 -178
178 lines not on this page · raw message
support/kconfig/patches/series +0 -1
@@ -1,5 +1,4 @@ 01-kconfig-kernel-to-buildroot.patch -02-cpp-comments-to-c-comments.patch 06-br-build-system-integration.patch 09-implement-kconfig-probability.patch 10-br-build-system.patch
Signature · 1 line
1.8.1.2
PATCH 4/4 support/kconfig: bump to kconfig from linux-3.12
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
With this, we can trash our probability patch, it's now upstream. Refresh a few other patches.
--- support/kconfig/Makefile | 4 +- support/kconfig/conf.c | 16 +- support/kconfig/confdata.c | 111 +++- support/kconfig/expr.h | 3 + support/kconfig/list.h | 40 ++ support/kconfig/lkc.h | 3 +- support/kconfig/lkc_proto.h | 1 + support/kconfig/lxdialog/check-lxdialog.sh | 6 +- support/kconfig/lxdialog/checklist.c | 8 +- support/kconfig/lxdialog/dialog.h | 21 + support/kconfig/lxdialog/inputbox.c | 8 +- support/kconfig/lxdialog/menubox.c | 15 +- support/kconfig/lxdialog/textbox.c | 6 +- support/kconfig/lxdialog/util.c | 85 +++- support/kconfig/lxdialog/yesno.c | 8 +- support/kconfig/mconf.c | 108 +++- support/kconfig/menu.c | 73 ++- support/kconfig/merge_config.sh | 10 +- support/kconfig/nconf.c | 41 +- support/kconfig/nconf.gui.c | 20 +- .../patches/01-kconfig-kernel-to-buildroot.patch | 22 +- .../patches/09-implement-kconfig-probability.patch | 44 -- .../patches/11-use-mktemp-for-lxdialog.patch | 2 +- .../patches/14-support-out-of-tree-config.patch | 14 +- .../kconfig/patches/15-fix-qconf-moc-rule.patch | 2 +- support/kconfig/patches/series | 1 - support/kconfig/streamline_config.pl | 26 +- support/kconfig/symbol.c | 103 +++- support/kconfig/zconf.tab.c_shipped | 562 +++++++++++---------- support/kconfig/zconf.y | 11 +- 30 files changed, 879 insertions(+), 495 deletions(-) delete mode 100644 support/kconfig/patches/09-implement-kconfig-probability.patch
support/kconfig/Makefile +3 -1
@@ -219,7 +219,9 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) -HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses +HOSTLOADLIBES_nconf = $(shell \ + pkg-config --libs menu panel ncurses 2>/dev/null \ + || echo "-lmenu -lpanel -lncurses" ) $(obj)/qconf.o: $(obj)/.tmp_qtcheck ifeq ($(qconf-target),1)
support/kconfig/conf.c +14 -2
@@ -13,6 +13,7 @@#include <getopt.h> #include <sys/stat.h> #include <sys/time.h> +#include <errno.h> #include "lkc.h"
@@ -514,14 +515,24 @@ int main(int ac, char **av) {struct timeval now;unsigned int seed; +char *seed_env;/* * Use microseconds derived seed, * compensate for systems where it may be zero */ gettimeofday (&now,NULL ); - seed = (unsigned int )((now.tv_sec +1 ) * (now.tv_usec +1 )); + + seed_env =getenv ("KCONFIG_SEED" ); +if ( seed_env && *seed_env ) { +char *endp; +int tmp = (int )strtol (seed_env, &endp,0 ); +if (*endp =='\0' ) { + seed = tmp; + } + } +fprintf ( stderr,"KCONFIG_SEED=0x%X\n" , seed );srand (seed);break ; }
@@ -642,7 +653,8 @@ int main(int ac, char **av)conf_set_all_new_symbols (def_default);break ;case randconfig: -conf_set_all_new_symbols (def_random); +/* Really nothing to do in this loop */ +while (conf_set_all_new_symbols (def_random)) ;break ;case defconfig:conf_set_all_new_symbols (def_default);
support/kconfig/confdata.c +85 -26
191 lines not on this page · raw message
support/kconfig/expr.h +3 -0
@@ -106,6 +106,9 @@ struct symbol {#define SYMBOL_DEF3 0x40000/* symbol.def[S_DEF_3] is valid */ #define SYMBOL_DEF4 0x80000/* symbol.def[S_DEF_4] is valid */ +/* choice values need to be set before calculating this symbol value */ +#define SYMBOL_NEED_SET_CHOICE_VALUES 0x100000 +#define SYMBOL_MAXLENGTH 256#define SYMBOL_HASHSIZE 9973
support/kconfig/list.h +40 -0
@@ -51,6 +51,19 @@ struct list_head { pos = list_entry(pos->member.next, typeof(*pos), member))/** +* list_for_each_entry_safe - iterate over list of given type safe against removal of list entry +* @pos: the type * to use as a loop cursor. +* @n: another type * to use as temporary storage +* @head: the head for your list. +* @member: the name of the list_struct within the struct. +*/ +#define list_for_each_entry_safe (pos, n, head, member) \ + for (pos = list_entry((head)->next, typeof(*pos), member), \ + n = list_entry(pos->member.next, typeof(*pos), member); \ + &pos->member != (head); \ + pos = n, n = list_entry(n->member.next, typeof(*n), member)) + +/** * list_empty - tests whether a list is empty * @head: the list to test. */
@@ -88,4 +101,31 @@ static inline void list_add_tail(struct list_head *_new, struct list_head *head) __list_add(_new, head->prev, head); } +/* +* Delete a list entry by making the prev/next entries +* point to each other. +* +* This is only for internal list manipulation where we know +* the prev/next entries already! +*/ +static inline void __list_del (struct list_head *prev,struct list_head *next) +{ + next->prev = prev; + prev->next = next; +} + +#define LIST_POISON1 ((void *) 0x00100100) +#define LIST_POISON2 ((void *) 0x00200200) +/** +* list_del - deletes entry from list. +* @entry: the element to delete from the list. +* Note: list_empty() on entry does not return true after this, the entry is +* in an undefined state. +*/ +static inline void list_del (struct list_head *entry) +{ +__list_del (entry->prev, entry->next); + entry->next = (struct list_head *)LIST_POISON1 ; + entry->prev = (struct list_head *)LIST_POISON2 ; +}#endif
support/kconfig/lkc.h +2 -1
@@ -86,7 +86,8 @@ const char *conf_get_autoconfig_name(void);char *conf_get_default_confname (void );void sym_set_change_count (int count);void sym_add_change_count (int count); -void conf_set_all_new_symbols (enum conf_def_mode mode); +bool conf_set_all_new_symbols (enum conf_def_mode mode); +void set_all_choice_values (struct symbol *csym);struct conf_printer {void (*print_symbol)(FILE *,struct symbol *,const char *,void *);
support/kconfig/lkc_proto.h +1 -0
@@ -14,6 +14,7 @@ P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap)));/* menu.c */ P(rootmenu,struct menu,); +P(menu_is_empty, bool, (struct menu *menu)); P(menu_is_visible, bool, (struct menu *menu)); P(menu_has_prompt, bool, (struct menu *menu)); P(menu_get_prompt,const char *,(struct menu *menu));
support/kconfig/lxdialog/check-lxdialog.sh +4 -2
@@ -4,6 +4,8 @@ # What library to link ldflags() { + pkg-config --libs ncursesw 2>/dev/null && exit + pkg-config --libs ncurses 2>/dev/null && exit for ext in so a dll.a dylib ; do for lib in ncursesw ncurses curses ; do $cc -print-file-name=lib${lib}.${ext} | grep -q /
@@ -20,12 +22,12 @@ ldflags() ccflags() { if [ -f /usr/include/ncursesw/curses.h ]; then - echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"' + echo '-I/usr/include/ncursesw -DCURSES_LOC="<curses.h>"' echo ' -DNCURSES_WIDECHAR=1' elif [ -f /usr/include/ncurses/ncurses.h ]; then echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"' elif [ -f /usr/include/ncurses/curses.h ]; then - echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"' + echo '-I/usr/include/ncurses -DCURSES_LOC="<curses.h>"' elif [ -f /usr/include/ncurses.h ]; then echo '-DCURSES_LOC="<ncurses.h>"' else
support/kconfig/lxdialog/checklist.c +4 -4
@@ -132,16 +132,16 @@ int dialog_checklist(const char *title, const char *prompt, int height, } do_resize: -if (getmaxy (stdscr) < (height +6 )) +if (getmaxy (stdscr) < (height +CHECKLIST_HEIGTH_MIN ))return -ERRDISPLAYTOOSMALL ; -if (getmaxx (stdscr) < (width +6 )) +if (getmaxx (stdscr) < (width +CHECKLIST_WIDTH_MIN ))return -ERRDISPLAYTOOSMALL ; max_choice =MIN (list_height,item_count ());/* center dialog box on screen */ - x = (COLS - width) /2 ; - y = (LINES - height) /2 ; + x = (getmaxx (stdscr) - width) /2 ; + y = (getmaxy (stdscr) - height) /2 ;draw_shadow (stdscr, y, x, height, width);
support/kconfig/lxdialog/dialog.h +21 -0
@@ -106,8 +106,14 @@ struct dialog_color {int hl;/* highlight this item */ }; +struct subtitle_list { +struct subtitle_list *next; +const char *text; +}; +struct dialog_info {const char *backtitle; +struct subtitle_list *subtitles;struct dialog_color screen;struct dialog_color shadow;struct dialog_color dialog;
@@ -194,8 +200,23 @@ int item_is_tag(char tag);int on_key_esc (WINDOW *win);int on_key_resize (void ); +/* minimum (re)size values */ +#define CHECKLIST_HEIGTH_MIN 6/* For dialog_checklist() */ +#define CHECKLIST_WIDTH_MIN 6 +#define INPUTBOX_HEIGTH_MIN 2/* For dialog_inputbox() */ +#define INPUTBOX_WIDTH_MIN 2 +#define MENUBOX_HEIGTH_MIN 15/* For dialog_menu() */ +#define MENUBOX_WIDTH_MIN 65 +#define TEXTBOX_HEIGTH_MIN 8/* For dialog_textbox() */ +#define TEXTBOX_WIDTH_MIN 8 +#define YESNO_HEIGTH_MIN 4/* For dialog_yesno() */ +#define YESNO_WIDTH_MIN 4 +#define WINDOW_HEIGTH_MIN 19/* For init_dialog() */ +#define WINDOW_WIDTH_MIN 80 +int init_dialog (const char *backtitle);void set_dialog_backtitle (const char *backtitle); +void set_dialog_subtitles (struct subtitle_list *subtitles);void end_dialog (int x,int y);void attr_clear (WINDOW * win,int height,int width,chtype attr);void dialog_clear (void );
support/kconfig/lxdialog/inputbox.c +4 -4
@@ -56,14 +56,14 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int widthstrcpy (instr, init); do_resize: -if (getmaxy (stdscr) <= (height -2 )) +if (getmaxy (stdscr) <= (height -INPUTBOX_HEIGTH_MIN ))return -ERRDISPLAYTOOSMALL ; -if (getmaxx (stdscr) <= (width -2 )) +if (getmaxx (stdscr) <= (width -INPUTBOX_WIDTH_MIN ))return -ERRDISPLAYTOOSMALL ;/* center dialog box on screen */ - x = (COLS - width) /2 ; - y = (LINES - height) /2 ; + x = (getmaxx (stdscr) - width) /2 ; + y = (getmaxy (stdscr) - height) /2 ;draw_shadow (stdscr, y, x, height, width);
support/kconfig/lxdialog/menubox.c +8 -7
@@ -193,7 +193,7 @@ int dialog_menu(const char *title, const char *prompt, do_resize: height =getmaxy (stdscr); width =getmaxx (stdscr); -if (height <15 || width <65 ) +if (height <MENUBOX_HEIGTH_MIN || width <MENUBOX_WIDTH_MIN )return -ERRDISPLAYTOOSMALL ; height -=4 ;
@@ -203,8 +203,8 @@ do_resize: max_choice =MIN (menu_height,item_count ());/* center dialog box on screen */ - x = (COLS - width) /2 ; - y = (LINES - height) /2 ; + x = (getmaxx (stdscr) - width) /2 ; + y = (getmaxy (stdscr) - height) /2 ;draw_shadow (stdscr, y, x, height, width);
@@ -303,10 +303,11 @@ do_resize: } } -if (i < max_choice || - key ==KEY_UP || key ==KEY_DOWN || - key =='-' || key =='+' || - key ==KEY_PPAGE || key ==KEY_NPAGE ) { +if (item_count () !=0 && + (i < max_choice || + key ==KEY_UP || key ==KEY_DOWN || + key =='-' || key =='+' || + key ==KEY_PPAGE || key ==KEY_NPAGE )) {/* Remove highligt of current item */ print_item (scroll + choice, choice, FALSE);
support/kconfig/lxdialog/textbox.c +3 -3
@@ -80,7 +80,7 @@ int dialog_textbox(const char *title, char *tbuf, int initial_height, do_resize:getmaxyx (stdscr, height, width); -if (height <8 || width <8 ) +if (height <TEXTBOX_HEIGTH_MIN || width <TEXTBOX_WIDTH_MIN )return -ERRDISPLAYTOOSMALL ;if (initial_height !=0 ) height = initial_height;
@@ -98,8 +98,8 @@ do_resize: width =0 ;/* center dialog box on screen */ - x = (COLS - width) /2 ; - y = (LINES - height) /2 ; + x = (getmaxx (stdscr) - width) /2 ; + y = (getmaxy (stdscr) - height) /2 ;draw_shadow (stdscr, y, x, height, width);
support/kconfig/lxdialog/util.c +67 -18
143 lines not on this page · raw message
support/kconfig/lxdialog/yesno.c +4 -4
@@ -45,14 +45,14 @@ int dialog_yesno(const char *title, const char *prompt, int height, int width)WINDOW *dialog; do_resize: -if (getmaxy (stdscr) < (height +4 )) +if (getmaxy (stdscr) < (height +YESNO_HEIGTH_MIN ))return -ERRDISPLAYTOOSMALL ; -if (getmaxx (stdscr) < (width +4 )) +if (getmaxx (stdscr) < (width +YESNO_WIDTH_MIN ))return -ERRDISPLAYTOOSMALL ;/* center dialog box on screen */ - x = (COLS - width) /2 ; - y = (LINES - height) /2 ; + x = (getmaxx (stdscr) - width) /2 ; + y = (getmaxy (stdscr) - height) /2 ;draw_shadow (stdscr, y, x, height, width);
support/kconfig/mconf.c +92 -16
224 lines not on this page · raw message
support/kconfig/menu.c +61 -12
115 lines not on this page · raw message
support/kconfig/merge_config.sh +9 -1
@@ -120,10 +120,18 @@ if [ "$MAKE" = "false" ]; then exit fi +# If we have an output dir, setup the O= argument, otherwise leave +# it blank, since O=. will create an unnecessary ./source softlink +OUTPUT_ARG="" +if [ "$OUTPUT" != "." ] ; then + OUTPUT_ARG="O=$OUTPUT" +fi + + # Use the merged file as the starting point for: # alldefconfig: Fills in any missing symbols with Kconfig default # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set -make KCONFIG_ALLCONFIG=$TMP_FILE O=$OUTPUT $ALLTARGET +make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET # Check all specified config values took (might have missed-dependency issues)
support/kconfig/nconf.c +24 -17
119 lines not on this page · raw message
support/kconfig/nconf.gui.c +11 -9
@@ -276,8 +276,8 @@ int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...) total_width =max (msg_width, btns_width);/* place dialog in middle of screen */ - y = (LINES -(msg_lines+4 ))/2 ; - x = (COLS -(total_width+4 ))/2 ; + y = (getmaxy (stdscr)-(msg_lines+4 ))/2 ; + x = (getmaxx (stdscr)-(total_width+4 ))/2 ;/* create the windows */
@@ -387,8 +387,8 @@ int dialog_inputbox(WINDOW *main_window, prompt_width =max (prompt_width,strlen (title));/* place dialog in middle of screen */ - y = (LINES -(prompt_lines+4 ))/2 ; - x = (COLS -(prompt_width+4 ))/2 ; + y = (getmaxy (stdscr)-(prompt_lines+4 ))/2 ; + x = (getmaxx (stdscr)-(prompt_width+4 ))/2 ;strncpy (result, init, *result_len);
@@ -545,7 +545,7 @@ void show_scroll_win(WINDOW *main_window, {int res;int total_lines =get_line_no (text); -int x, y; +int x, y, lines, columns;int start_x =0 , start_y =0 ;int text_lines =0 , text_cols =0 ;int total_cols =0 ;
@@ -556,6 +556,8 @@ void show_scroll_win(WINDOW *main_window,WINDOW *pad;PANEL *panel; +getmaxyx (stdscr, lines, columns); +/* find the widest line of msg: */ total_lines =get_line_no (text);for (i =0 ; i < total_lines; i++) {
@@ -569,14 +571,14 @@ void show_scroll_win(WINDOW *main_window, (void )wattrset (pad, attributes[SCROLLWIN_TEXT ]);fill_window (pad, text); - win_lines =min (total_lines+4 ,LINES -2 ); - win_cols =min (total_cols+2 ,COLS -2 ); + win_lines =min (total_lines+4 , lines-2 ); + win_cols =min (total_cols+2 , columns-2 ); text_lines =max (win_lines-4 ,0 ); text_cols =max (win_cols-2 ,0 );/* place window in middle of screen */ - y = (LINES -win_lines)/2 ; - x = (COLS -win_cols)/2 ; + y = (lines-win_lines)/2 ; + x = (columns-win_cols)/2 ; win =newwin (win_lines, win_cols, y, x);keypad (win, TRUE);
support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch +11 -11
@@ -25,7 +25,7 @@ Index: b/mconf.c +++ b/mconf.c @@ -178,9 +178,9 @@ "Arrow keys navigate the menu. " - "<Enter> selects submenus --->. " + "<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. "
@@ -39,10 +39,10 @@ Index: b/zconf.tab.c_shipped =================================================================== --- a/zconf.tab.c_shipped +++ b/zconf.tab.c_shipped -@@ -2259,7 +2259,7 @@ - modules_sym = sym_lookup(NULL, 0); - modules_sym->type = S_BOOLEAN; - modules_sym->flags |= SYMBOL_AUTO; +@@ -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);
@@ -52,10 +52,10 @@ Index: b/zconf.y =================================================================== --- a/zconf.y +++ b/zconf.y -@@ -496,7 +496,7 @@ - modules_sym = sym_lookup(NULL, 0); - modules_sym->type = S_BOOLEAN; - modules_sym->flags |= SYMBOL_AUTO; +@@ -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);
@@ -65,7 +65,7 @@ Index: b/confdata.c =================================================================== --- a/confdata.c +++ b/confdata.c -@@ -25,7 +26,7 @@ +@@ -25,7 +25,7 @@ static const char *conf_filename; static int conf_lineno, conf_warnings, conf_unsaved;
@@ -74,7 +74,7 @@ Index: b/confdata.c static void conf_warning(const char *fmt, ...) { -@@ -63,7 +64,7 @@ +@@ -63,7 +63,7 @@ const char *conf_get_configname(void) {
support/kconfig/patches/09-implement-kconfig-probability.patch deleted +0 -44
44 lines not on this page · raw message
support/kconfig/patches/11-use-mktemp-for-lxdialog.patch +1 -1
@@ -6,7 +6,7 @@ Index: b/lxdialog/check-lxdialog.sh =================================================================== --- a/lxdialog/check-lxdialog.sh +++ b/lxdialog/check-lxdialog.sh -@@ -34,7 +34,7 @@ +@@ -36,7 +36,7 @@ } # Temp file, try to clean up after us
support/kconfig/patches/14-support-out-of-tree-config.patch +7 -7
@@ -8,7 +8,7 @@ Index: b/conf.c =================================================================== --- a/conf.c +++ b/conf.c -@@ -547,7 +547,6 @@ +@@ -558,7 +558,6 @@ } name = av[optind]; conf_parse(name);
@@ -39,7 +39,7 @@ Index: b/confdata.c } static char *conf_expand_value(const char *in) -@@ -737,6 +736,9 @@ +@@ -742,6 +741,9 @@ char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1]; char *env;
@@ -49,7 +49,7 @@ Index: b/confdata.c dirname[0] = 0; if (name && name[0]) { struct stat st; -@@ -831,6 +833,7 @@ +@@ -836,6 +838,7 @@ { const char *name; char path[PATH_MAX+1];
@@ -57,7 +57,7 @@ Index: b/confdata.c char *s, *d, c; struct symbol *sym; struct stat sb; -@@ -839,8 +842,20 @@ +@@ -844,8 +847,20 @@ name = conf_get_autoconfig_name(); conf_read_simple(name, S_DEF_AUTO);
@@ -80,7 +80,7 @@ Index: b/confdata.c res = 0; for_all_symbols(i, sym) { -@@ -933,9 +948,11 @@ +@@ -938,9 +953,11 @@ close(fd); } out:
@@ -95,7 +95,7 @@ Index: b/confdata.c return res; } -@@ -945,25 +962,38 @@ +@@ -950,25 +967,38 @@ const char *name; FILE *out, *tristate, *out_h; int i;
@@ -138,7 +138,7 @@ Index: b/confdata.c if (!out_h) { fclose(out); fclose(tristate); -@@ -995,19 +1025,22 @@ +@@ -1000,19 +1030,22 @@ name = getenv("KCONFIG_AUTOHEADER"); if (!name) name = "include/generated/autoconf.h";
support/kconfig/patches/15-fix-qconf-moc-rule.patch +1 -1
@@ -9,7 +9,7 @@ Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -307,11 +307,8 @@ +@@ -309,11 +309,8 @@ $(obj)/qconf.o: $(obj)/qconf.moc
support/kconfig/patches/series +0 -1
@@ -1,6 +1,5 @@ 01-kconfig-kernel-to-buildroot.patch 06-br-build-system-integration.patch -09-implement-kconfig-probability.patch 10-br-build-system.patch 11-use-mktemp-for-lxdialog.patch 12-fix-glade-file-path.patch
support/kconfig/streamline_config.pl +16 -10
@@ -156,7 +156,6 @@ sub read_kconfig { my $state = "NONE"; my $config; - my @kconfigs; my $cont = 0; my $line;
@@ -190,7 +189,13 @@ sub read_kconfig { # collect any Kconfig sources if (/^source\s*"(.*)"/) { - $kconfigs[$#kconfigs+1] = $1; + my $kconfig = $1; + # prevent reading twice. + if (!defined($read_kconfigs{$kconfig})) { + $read_kconfigs{$kconfig} = 1; + read_kconfig($kconfig); + } + next; } # configs found
@@ -250,14 +255,6 @@ sub read_kconfig { } } close($kinfile); - - # read in any configs that were found. - foreach my $kconfig (@kconfigs) { - if (!defined($read_kconfigs{$kconfig})) { - $read_kconfigs{$kconfig} = 1; - read_kconfig($kconfig); - } - } } if ($kconfig) {
@@ -396,6 +393,15 @@ foreach my $module (keys(%modules)) { foreach my $conf (@arr) { $configs{$conf} = $module; dprint "$conf added by direct ($module)\n"; + if ($debugprint) { + my $c=$conf; + $c =~ s/^CONFIG_//; + if (defined($depends{$c})) { + dprint " deps = $depends{$c}\n"; + } else { + dprint " no deps\n"; + } + } } } else { # Most likely, someone has a custom (binary?) module loaded.
support/kconfig/symbol.c +83 -20
190 lines not on this page · raw message
support/kconfig/zconf.tab.c_shipped +298 -264
1,026 lines not on this page · raw message
support/kconfig/zconf.y +2 -9
@@ -493,9 +493,6 @@ void conf_parse(const char *name) sym_init(); _menu_init(); - modules_sym = sym_lookup(NULL, 0); - modules_sym->type = S_BOOLEAN; - modules_sym->flags |= SYMBOL_AUTO; rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL); if (getenv("ZCONF_DEBUG"))
@@ -503,12 +500,8 @@ void conf_parse(const char *name) zconfparse(); if (zconfnerrs) exit(1); - if (!modules_sym->prop) { - struct property *prop; - - prop = prop_alloc(P_DEFAULT, modules_sym); - prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0)); - } + if (!modules_sym) + modules_sym = sym_find( "n" ); rootmenu.prompt->text = _(rootmenu.prompt->text); rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
Signature · 1 line
1.8.1.2
PATCH 4/4 support/kconfig: bump to kconfig from linux-3.12
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]>
With this, we can trash our probability patch, it's now upstream. Refresh a few other patches.Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>
Thanks. Strangely enough pwclient doesn't like the patch:
pwclient get 291086
Traceback (most recent call last):
File "/home/peko/bin/pwclient", line 500, in <module>
main()
File "/home/peko/bin/pwclient", line 465, in main
action_get(rpc, patch_id)
File "/home/peko/bin/pwclient", line 238, in action_get
s = rpc.patch_get_mbox(patch_id)
File "/usr/lib/python2.7/xmlrpclib.py", line 1224, in __call__
return self.__send(self.__name, args)
File "/usr/lib/python2.7/xmlrpclib.py", line 1578, in __request
verbose=self.__verbose
File "/usr/lib/python2.7/xmlrpclib.py", line 1264, in request
return self.single_request(host, handler, request_body, verbose)
File "/usr/lib/python2.7/xmlrpclib.py", line 1297, in single_request
return self.parse_response(response)
File "/usr/lib/python2.7/xmlrpclib.py", line 1467, in parse_response
p.feed(data)
File "/usr/lib/python2.7/xmlrpclib.py", line 557, in feed
self._parser.Parse(data, 0)xml.parsers.expat.ExpatError: not well-formed (invalid token): line 2069, column 1
But it seems to work OK if I use the mbox link on the patchwork website.
Jeremy, any ideas?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/4 support/kconfig: bump to kconfig from linux-3.12
Peter, Jeremy,
Quoted 6 lines · Peter Korsgaard
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]>
With this, we can trash our probability patch, it's now upstream. Refresh a few other patches.
Quoted 7 lines
Quoted 2 lines
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>Thanks. Strangely enough pwclient doesn't like the patch:
pwclient get 291086
Traceback (most recent call last):
BTW, another issue I had with pwclient is when the author name contains non ASCII characters such as french accents. pwclient fails with one of the well-known Python exception regarding charset conversion problems.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 4/4 support/kconfig: bump to kconfig from linux-3.12
In reply to Peter KorsgaardJeremy, Peter, All,
On 2013-11-14 12:41 +0100, Peter Korsgaard spake thusly:
Quoted 31 lines
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]>
With this, we can trash our probability patch, it's now upstream. Refresh a few other patches.Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>Thanks. Strangely enough pwclient doesn't like the patch:
pwclient get 291086
Traceback (most recent call last):
File "/home/peko/bin/pwclient", line 500, in <module>main() File "/home/peko/bin/pwclient", line 465, in main action_get(rpc, patch_id) File "/home/peko/bin/pwclient", line 238, in action_get s = rpc.patch_get_mbox(patch_id) File "/usr/lib/python2.7/xmlrpclib.py", line 1224, in __call__ return self.__send(self.__name, args) File "/usr/lib/python2.7/xmlrpclib.py", line 1578, in __request verbose=self.__verbose File "/usr/lib/python2.7/xmlrpclib.py", line 1264, in request return self.single_request(host, handler, request_body, verbose) File "/usr/lib/python2.7/xmlrpclib.py", line 1297, in single_request return self.parse_response(response) File "/usr/lib/python2.7/xmlrpclib.py", line 1467, in parse_response p.feed(data) File "/usr/lib/python2.7/xmlrpclib.py", line 557, in feed self._parser.Parse(data, 0)
Quoted 6 lines
xml.parsers.expat.ExpatError: not well-formed (invalid token): line 2069, column 1
But it seems to work OK if I use the mbox link on the patchwork website.
Jeremy, any ideas?
It seems the ^L character in that hunk is what causes the issue. And there is another hunk with another ^L in it.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]>
Hello All!While I was at it to fix the kconfig space-can't-deselect issue, I decided to go a bit further, and update and clean up our kconfig.
Quoted 6 lines
So here is this series for 'next'.
Note that we ditch two of our patches: one because it is useless (C++-style comments), one because it's been upstreamed (probability). Also, the README was updated to also include copying of .gitignore, which was missing so far.
Committed to next, thanks. I will cherry pick patch 1 to master in a day or two as well if no problems are noticed.
Signature · 1 line
Bye, Peter Korsgaard