Update kconfig code
PATCH 1/1 Update kconfig code
Hello,
Here are two patches that update our kconfig code to a more recent kernel version. Initially, my goal was to be able to bring in Yann's patch that fixes the randomization of kconfig choices, but it turned out that the patch doesn't work completely. However, updating the kconfig code still makes sense, and brings the additional 'make olddefconfig' target.
Best regards,
Thomas
PATCH 1/2 support/kconfig: upgrade to 3.9-rc2
Our kconfig code is updated to the version of kernel 3.9-rc2. No major issues during the migration, except:
* Some conflicts when applying 03-change-config-option-prefix.patch due to upstream kernel changes.
* The need of adding a new patch, 15-fix-qconf-moc-rule.patch, to fix the make rule that generates the moc file for the Qt-based interface.
---
support/kconfig/Makefile | 145 +++----
support/kconfig/README.buildroot2 | 2 +-
support/kconfig/check.sh | 2 +-
support/kconfig/conf.c | 98 +++--
support/kconfig/confdata.c | 369 ++++++++++++------
support/kconfig/expr.c | 15 +-
support/kconfig/expr.h | 12 +-
support/kconfig/gconf.c | 51 +--
support/kconfig/kconfig_load.c | 35 --
support/kconfig/kxgettext.c | 1 -
support/kconfig/list.h | 91 +++++
support/kconfig/lkc.h | 32 +-
support/kconfig/lkc_proto.h | 7 +-
support/kconfig/lxdialog/check-lxdialog.sh | 11 +-
support/kconfig/lxdialog/dialog.h | 10 +-
support/kconfig/lxdialog/inputbox.c | 121 ++++--
support/kconfig/lxdialog/menubox.c | 20 +-
support/kconfig/lxdialog/textbox.c | 177 +++++----
support/kconfig/lxdialog/util.c | 7 +
support/kconfig/mconf.c | 269 +++++++++----
support/kconfig/menu.c | 75 +++-
support/kconfig/merge_config.sh | 142 +++++++
support/kconfig/nconf.c | 401 ++++++++++----------
support/kconfig/nconf.gui.c | 69 +++-
support/kconfig/nconf.h | 2 +-
.../patches/01-kconfig-kernel-to-buildroot.patch | 32 +-
.../patches/02-cpp-comments-to-c-comments.patch | 30 +-
.../patches/03-change-config-option-prefix.patch | 174 ++++-----
.../patches/06-br-build-system-integration.patch | 10 +-
.../patches/09-implement-kconfig-probability.patch | 10 +-
support/kconfig/patches/10-br-build-system.patch | 8 +-
.../patches/11-use-mktemp-for-lxdialog.patch | 8 +-
.../kconfig/patches/12-fix-glade-file-path.patch | 8 +-
.../patches/14-support-out-of-tree-config.patch | 38 +-
.../kconfig/patches/15-fix-qconf-moc-rule.patch | 24 ++
support/kconfig/patches/series | 1 +
support/kconfig/qconf.cc | 18 +-
support/kconfig/qconf.h | 2 +-
support/kconfig/streamline_config.pl | 291 +++++++++++---
support/kconfig/symbol.c | 66 +++-
support/kconfig/util.c | 25 +-
support/kconfig/zconf.gperf | 2 +-
support/kconfig/zconf.hash.c_shipped | 273 +++++++------
support/kconfig/zconf.l | 17 +-
.../{lex.zconf.c_shipped => zconf.lex.c_shipped} | 35 +-
support/kconfig/zconf.tab.c_shipped | 69 ++--
support/kconfig/zconf.y | 19 +-
47 files changed, 2076 insertions(+), 1248 deletions(-)
delete mode 100644 support/kconfig/kconfig_load.c
create mode 100644 support/kconfig/list.h
create mode 100755 support/kconfig/merge_config.sh
create mode 100644 support/kconfig/patches/15-fix-qconf-moc-rule.patch
rename support/kconfig/{lex.zconf.c_shipped => zconf.lex.c_shipped} (98%)support/kconfig/Makefile +50 -95
@@ -11,6 +11,9 @@ else Kconfig := Kconfig endif +# We need this, in case the user has it in its environment +unexport CONFIG_ + xconfig: $(obj)/qconf $< $(Kconfig)
@@ -33,17 +36,9 @@ silentoldconfig: $(obj)/conf $(Q)mkdir -p include/generated $< --$@ $(Kconfig) -# if no path is given, then use src directory to find file -ifdef LSMOD -LSMOD_F := $(LSMOD) -ifeq ($(findstring /,$(LSMOD)),) - LSMOD_F := $(objtree)/$(LSMOD) -endif -endif - -localmodconfig: $(obj)/streamline_config.pl $(obj)/conf +localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf $(Q)mkdir -p include/generated - $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config + $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config $(Q)if [ -f .config ]; then \ cmp -s .tmp.config .config || \ (mv -f .config .config.old.1; \
@@ -56,27 +51,10 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf fi $(Q)rm -f .tmp.config -localyesconfig: $(obj)/streamline_config.pl $(obj)/conf - $(Q)mkdir -p include/generated - $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config - $(Q)sed -i s/=m/=y/ .tmp.config - $(Q)if [ -f .config ]; then \ - cmp -s .tmp.config .config || \ - (mv -f .config .config.old.1; \ - mv -f .tmp.config .config; \ - $(obj)/conf --silentoldconfig $(Kconfig); \ - mv -f .config.old.1 .config.old) \ - else \ - mv -f .tmp.config .config; \ - $(obj)/conf --silentoldconfig $(Kconfig); \ - fi - $(Q)rm -f .tmp.config - # Create new linux.pot file # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files -# The symlink is used to repair a deficiency in arch/um update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h - $(Q)echo " GEN config" + $(Q)echo " GEN config.pot" $(Q)xgettext --default-domain=linux \ --add-comments --keyword=_ --keyword=N_ \ --from-code=UTF-8 \
@@ -84,16 +62,16 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h --directory=$(srctree) --directory=$(objtree) \ --output $(obj)/config.pot $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot - $(Q)ln -fs Kconfig.x86 arch/um/Kconfig - $(Q)(for i in `ls $(srctree)/arch/*/Kconfig`; \ + $(Q)(for i in `ls $(srctree)/arch/*/Kconfig \ + $(srctree)/arch/*/um/Kconfig`; \ do \ - echo " GEN $$i"; \ + echo " GEN $$i"; \ $(obj)/kxgettext $$i \ >> $(obj)/config.pot; \ done ) + $(Q)echo " GEN linux.pot" $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \ --output $(obj)/linux.pot - $(Q)rm -f $(srctree)/arch/um/Kconfig $(Q)rm -f $(obj)/config.pot PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
@@ -101,11 +79,17 @@ PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf $< --$@ $(Kconfig) -PHONY += listnewconfig oldnoconfig savedefconfig defconfig +PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig -listnewconfig oldnoconfig: $(obj)/conf +listnewconfig olddefconfig: $(obj)/conf $< --$@ $(Kconfig) +# oldnoconfig is an alias of olddefconfig, because people already are dependent +# on its behavior(sets new symbols to their default value but not 'n') with the +# counter-intuitive name. +oldnoconfig: $(obj)/conf + $< --olddefconfig $(Kconfig) + savedefconfig: $(obj)/conf $< --$@=defconfig $(Kconfig)
@@ -139,7 +123,7 @@ help: @echo ' alldefconfig - New config with all symbols set to default' @echo ' randconfig - New config with random answer to all options' @echo ' listnewconfig - List new options' - @echo ' oldnoconfig - Same as silentoldconfig but set new symbols to n (unset)' + @echo ' olddefconfig - Same as silentoldconfig but sets new symbols to their default value' # lxdialog stuff check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
@@ -170,8 +154,8 @@ mconf-objs := mconf.o zconf.tab.o $(lxdialog) nconf-objs := nconf.o zconf.tab.o nconf.gui.o kxgettext-objs := kxgettext.o zconf.tab.o qconf-cxxobjs := qconf.o -qconf-objs := kconfig_load.o zconf.tab.o -gconf-objs := gconf.o kconfig_load.o zconf.tab.o +qconf-objs := zconf.tab.o +gconf-objs := gconf.o zconf.tab.o hostprogs-y := conf
@@ -203,8 +187,8 @@ ifeq ($(gconf-target),1) hostprogs-y += gconf endif -clean-files := lkc_defs.h qconf.moc .tmp_qtcheck .tmp_gtkcheck -clean-files += zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h +clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck +clean-files += zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h clean-files += mconf qconf gconf nconf clean-files += config.pot linux.pot
@@ -220,15 +204,18 @@ always := dochecklxdialog HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS)) # generated files seem to need this to find local include files -HOSTCFLAGS_lex.zconf.o := -I$(src) +HOSTCFLAGS_zconf.lex.o := -I$(src) HOSTCFLAGS_zconf.tab.o := -I$(src) -HOSTLOADLIBES_qconf = $(KC_QT_LIBS) -ldl -HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK +LEX_PREFIX_zconf := zconf +YACC_PREFIX_zconf := zconf + +HOSTLOADLIBES_qconf = $(KC_QT_LIBS) +HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl +HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ - -D LKC_DIRECT_LINK + -Wno-missing-prototypes HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
@@ -256,12 +243,12 @@ $(obj)/.tmp_qtcheck: if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \ done; \ if [ -z "$$dir" ]; then \ - echo "*"; \ - echo "* Unable to find any QT installation. Please make sure that"; \ - echo "* the QT4 or QT3 development package is correctly installed and"; \ - echo "* either qmake can be found or install pkg-config or set"; \ - echo "* the QTDIR environment variable to the correct location."; \ - echo "*"; \ + echo >&2 "*"; \ + echo >&2 "* Unable to find any QT installation. Please make sure that"; \ + echo >&2 "* the QT4 or QT3 development package is correctly installed and"; \ + echo >&2 "* either qmake can be found or install pkg-config or set"; \ + echo >&2 "* the QTDIR environment variable to the correct location."; \ + echo >&2 "*"; \ false; \ fi; \ libpath=$$dir/lib; lib=qt; osdir=""; \
@@ -282,8 +269,8 @@ $(obj)/.tmp_qtcheck: else \ cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \ libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \ - binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \ - moc="$$binpath/bin/moc"; \ + moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \ + [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \ fi; \ echo "KC_QT_CFLAGS=$$cflags" > $@; \ echo "KC_QT_LIBS=$$libs" >> $@; \
@@ -301,62 +288,30 @@ $(obj)/.tmp_gtkcheck: if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then \ touch $@; \ else \ - echo "*"; \ - echo "* GTK+ is present but version >= 2.0.0 is required."; \ - echo "*"; \ + echo >&2 "*"; \ + echo >&2 "* GTK+ is present but version >= 2.0.0 is required."; \ + echo >&2 "*"; \ false; \ fi \ else \ - echo "*"; \ - echo "* Unable to find the GTK+ installation. Please make sure that"; \ - echo "* the GTK+ 2.0 development package is correctly installed..."; \ - echo "* You need gtk+-2.0, glib-2.0 and libglade-2.0."; \ - echo "*"; \ + echo >&2 "*"; \ + echo >&2 "* Unable to find the GTK+ installation. Please make sure that"; \ + echo >&2 "* the GTK+ 2.0 development package is correctly installed..."; \ + echo >&2 "* You need gtk+-2.0, glib-2.0 and libglade-2.0."; \ + echo >&2 "*"; \ false; \ fi endif -$(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c +$(obj)/zconf.tab.o: $(obj)/zconf.lex.c $(obj)/zconf.hash.c -$(obj)/kconfig_load.o: $(obj)/lkc_defs.h +$(obj)/qconf.o: $(obj)/qconf.moc -$(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h - -$(obj)/gconf.o: $(obj)/lkc_defs.h - -$(obj)/%.moc: $(src)/%.h +$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck $(KC_QT_MOC) -i $< -o $@ -$(obj)/lkc_defs.h: $(src)/lkc_proto.h - $(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/' - # Extract gconf menu items for I18N support $(obj)/gconf.glade.h: $(obj)/gconf.glade $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \ $(obj)/gconf.glade -### -# The following requires flex/bison/gperf -# By default we use the _shipped versions, uncomment the following line if -# you are modifying the flex/bison src. -# LKC_GENPARSER := 1 - -ifdef LKC_GENPARSER - -$(obj)/zconf.tab.c: $(src)/zconf.y -$(obj)/lex.zconf.c: $(src)/zconf.l -$(obj)/zconf.hash.c: $(src)/zconf.gperf - -%.tab.c: %.y - bison -l -b $* -p $(notdir $*) $< - cp $@ $@_shipped - -lex.%.c: %.l - flex -L -P$(notdir $*) -o$@ $< - cp $@ $@_shipped - -%.hash.c: %.gperf - gperf < $< > $@ - cp $@ $@_shipped - -endif
support/kconfig/README.buildroot2 +1 -1
@@ -1,4 +1,4 @@ -This is a copy of the kconfig code in the kernel (currently 2.6.37-rc1) tweaked +This is a copy of the kconfig code in the kernel (currently 3.9-rc2) tweaked to suit Buildroot. To update:
support/kconfig/check.sh +1 -1
@@ -1,6 +1,6 @@ #!/bin/sh # Needed for systems without gettext -$* -xc -o /dev/null - > /dev/null 2>&1 << EOF +$* -x c -o /dev/null - > /dev/null 2>&1 << EOF #include <libintl.h> int main() {
support/kconfig/conf.c +75 -23
230 lines not on this page · raw message
support/kconfig/confdata.c +247 -122
525 lines not on this page · raw message
support/kconfig/expr.c +5 -10
@@ -7,15 +7,13 @@#include <stdlib.h> #include <string.h> -#define LKC_DIRECT_LINK #include "lkc.h" #define DEBUG_EXPR 0struct expr *expr_alloc_symbol (struct symbol *sym) { -struct expr *e =malloc (sizeof (*e)); -memset (e,0 ,sizeof (*e)); +struct expr *e =xcalloc (1 ,sizeof (*e)); e->type =E_SYMBOL ; e->left.sym = sym;return e;
@@ -23,8 +21,7 @@ struct expr *expr_alloc_symbol(struct symbol *sym)struct expr *expr_alloc_one (enum expr_type type,struct expr *ce) { -struct expr *e =malloc (sizeof (*e)); -memset (e,0 ,sizeof (*e)); +struct expr *e =xcalloc (1 ,sizeof (*e)); e->type = type; e->left.expr = ce;return e;
@@ -32,8 +29,7 @@ struct expr *expr_alloc_one(enum expr_type type, struct expr *ce)struct expr *expr_alloc_two (enum expr_type type,struct expr *e1,struct expr *e2) { -struct expr *e =malloc (sizeof (*e)); -memset (e,0 ,sizeof (*e)); +struct expr *e =xcalloc (1 ,sizeof (*e)); e->type = type; e->left.expr = e1; e->right.expr = e2;
@@ -42,8 +38,7 @@ struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *estruct expr *expr_alloc_comp (enum expr_type type,struct symbol *s1,struct symbol *s2) { -struct expr *e =malloc (sizeof (*e)); -memset (e,0 ,sizeof (*e)); +struct expr *e =xcalloc (1 ,sizeof (*e)); e->type = type; e->left.sym = s1; e->right.sym = s2;
@@ -71,7 +66,7 @@ struct expr *expr_copy(const struct expr *org)if (!org)return NULL ; - e =malloc (sizeof (*org)); + e =xmalloc (sizeof (*org));memcpy (e, org,sizeof (*org));switch (org->type) {case E_SYMBOL :
support/kconfig/expr.h +10 -2
@@ -10,7 +10,9 @@extern "C" {#endif +#include <assert.h> #include <stdio.h> +#include "list.h" #ifndef __cplusplus#include <stdbool.h> #endif
@@ -172,7 +174,14 @@ struct menu {#define MENU_CHANGED 0x0001#define MENU_ROOT 0x0002 -#ifndef SWIG +struct jump_key { +struct list_head entries; +size_t offset; +struct menu *target; +int index; +}; + +#define JUMP_NB 9extern struct file *file_list;extern struct file *current_file;
@@ -218,7 +227,6 @@ static inline int expr_is_no(struct expr *e) {return e && (e->type ==E_SYMBOL && e->left.sym == &symbol_no); } -#endif #ifdef __cplusplus }
support/kconfig/gconf.c +6 -45
135 lines not on this page · raw message
support/kconfig/kconfig_load.c deleted +0 -35
@@ -1,35 +0,0 @@ -#include <dlfcn.h> -#include <stdio.h> -#include <stdlib.h> - -#include "lkc.h" - -#define P (name,type,arg) type (*name ## _p) arg -#include "lkc_proto.h" -#undef P - -void kconfig_load (void ) -{ -void *handle; -char *error; - - handle =dlopen ("./libkconfig.so" ,RTLD_LAZY ); -if (!handle) { - handle =dlopen ("./scripts/kconfig/libkconfig.so" ,RTLD_LAZY ); -if (!handle) { -fprintf (stderr,"%s\n" ,dlerror ()); -exit (1 ); - } - } - -#define P (name,type,arg) \ -{ \ - name ## _p = dlsym(handle, #name); \ - if ((error = dlerror())) { \ - fprintf(stderr, "%s\n", error); \ - exit(1); \ - } \ -} -#include "lkc_proto.h" -#undef P -}
support/kconfig/kxgettext.c +0 -1
@@ -7,7 +7,6 @@#include <stdlib.h> #include <string.h> -#define LKC_DIRECT_LINK #include "lkc.h" static char *escape (const char * text,char *bf,int len)
support/kconfig/list.h new file +91 -0
91 lines not on this page · raw message
support/kconfig/lkc.h +17 -15
@@ -21,12 +21,7 @@ static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c;extern "C" {#endif -#ifdef LKC_DIRECT_LINK #define P (name,type,arg) extern type name arg -#else -#include "lkc_defs.h" -#define P (name,type,arg) extern type (*name ## _p) arg -#endif #include "lkc_proto.h" #undef P
@@ -44,6 +39,12 @@ extern "C" {#ifndef CONFIG_ #define CONFIG_ "BR2_"#endif +static inline const char *CONFIG_prefix (void ) +{ +return getenv ("CONFIG_" ) ?:CONFIG_ ; +} +#undef CONFIG_ +#define CONFIG_ CONFIG_prefix()#define TF_COMMAND 0x0001#define TF_PARAM 0x0002
@@ -68,9 +69,7 @@ struct kconf_id {enum symbol_type stype; }; -#ifdef YYDEBUG extern int zconfdebug; -#endif int zconfparse (void );void zconfdump (FILE *out);
@@ -81,9 +80,6 @@ void zconf_nextfile(const char *name);int zconf_lineno (void );const char *zconf_curname (void ); -/* conf.c */ -void xfgets (char *str,int size,FILE *in); -/* confdata.c */ const char *conf_get_configname (void );const char *conf_get_autoconfig_name (void );
@@ -92,15 +88,19 @@ 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); +struct conf_printer { +void (*print_symbol)(FILE *,struct symbol *,const char *,void *); +void (*print_comment)(FILE *,const char *,void *); +}; +/* confdata.c and expr.c */ static inline void xfwrite (const void *str,size_t len,size_t count,FILE *out) { -if (fwrite (str, len, count, out) < count) -fprintf (stderr,"\nError in writing or end of file.\n" ); -} +assert (len !=0 ); -/* kconfig_load.c */ -void kconfig_load (void ); +if (fwrite (str, len, count, out) != count) +fprintf (stderr,"Error in writing or end of file.\n" ); +}/* menu.c */ void _menu_init (void );
@@ -122,6 +122,8 @@ void menu_set_type(int type);/* util.c */ struct file *file_lookup (const char *name);int file_write_dep (const char *name); +void *xmalloc (size_t size); +void *xcalloc (size_t nmemb,size_t size);struct gstr {size_t len;
support/kconfig/lkc_proto.h +5 -2
@@ -21,8 +21,10 @@ P(menu_get_root_menu,struct menu *,(struct menu *menu)); P(menu_get_parent_menu,struct menu *,(struct menu *menu)); P(menu_has_help,bool,(struct menu *menu)); P(menu_get_help,const char *,(struct menu *menu)); -P(get_symbol_str, void, (struct gstr *r, struct symbol *sym)); -P(get_relations_str, struct gstr, (struct symbol **sym_arr)); +P(get_symbol_str, void, (struct gstr *r, struct symbol *sym, struct list_head + *head)); +P(get_relations_str, struct gstr, (struct symbol **sym_arr, struct list_head + *head)); P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help));/* symbol.c */
@@ -31,6 +33,7 @@ P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]); P(sym_lookup,struct symbol *,(const char *name, int flags)); P(sym_find,struct symbol *,(const char *name)); P(sym_expand_string_value,const char *,(const char *in)); +P(sym_escape_string_value, const char *,(const char *in)); P(sym_re_search,struct symbol **,(const char *pattern)); P(sym_type_name,const char *,(enum symbol_type type)); P(sym_calc_value,void,(struct symbol *sym));
support/kconfig/lxdialog/check-lxdialog.sh +6 -5
@@ -4,7 +4,7 @@ # What library to link ldflags() { - for ext in so a dylib ; do + 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 / if [ $? -eq 0 ]; then
@@ -19,12 +19,13 @@ ldflags() # Where is ncurses.h? ccflags() { - if [ -f /usr/include/ncurses/ncurses.h ]; then + if [ -f /usr/include/ncursesw/curses.h ]; then + echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/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>"' - elif [ -f /usr/include/ncursesw/curses.h ]; then - echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"' elif [ -f /usr/include/ncurses.h ]; then echo '-DCURSES_LOC="<ncurses.h>"' else
@@ -38,7 +39,7 @@ trap "rm -f $tmp" 0 1 2 3 15 # Check if we can link to ncurses check() { - $cc -xc - -o $tmp 2>/dev/null <<'EOF' + $cc -x c - -o $tmp 2>/dev/null <<'EOF' #include CURSES_LOC main() {} EOF
support/kconfig/lxdialog/dialog.h +8 -2
@@ -144,6 +144,7 @@ struct dialog_info {*/ extern struct dialog_info dlg;extern char dialog_input_result[]; +extern int saved_x, saved_y;/* Needed in signal handler in mconf.c */ /* * Function prototypes
@@ -209,12 +210,17 @@ int first_alpha(const char *string, const char *exempt);int dialog_yesno (const char *title,const char *prompt,int height,int width);int dialog_msgbox (const char *title,const char *prompt,int height,int width,int pause); -int dialog_textbox (const char *title,const char *file,int height,int width); + + +typedef void (*update_text_fn )(char *buf,size_t start,size_t end,void + *_data); +int dialog_textbox (const char *title,char *tbuf,int initial_height, +int initial_width,int *keys,int *_vscroll,int *_hscroll, +update_text_fn update_text,void *data);int dialog_menu (const char *title,const char *prompt,const void *selected,int *s_scroll);int dialog_checklist (const char *title,const char *prompt,int height,int width,int list_height); -extern char dialog_input_result[];int dialog_inputbox (const char *title,const char *prompt,int height,int width,const char *init);
support/kconfig/lxdialog/inputbox.c +92 -29
158 lines not on this page · raw message
support/kconfig/lxdialog/menubox.c +11 -9
@@ -26,7 +26,7 @@* * *) A bugfix for the Page-Down problem * -* *) Formerly when I used Page Down and Page Up, the cursor would be set +* *) Formerly when I used Page Down and Page Up, the cursor would be set * to the first position in the menu box. Now lxdialog is a bit * smarter and works more like other menu systems (just have a look at * it).
@@ -154,12 +154,14 @@ static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x,*/ static void print_buttons (WINDOW * win,int height,int width,int selected) { -int x = width /2 -16 ; +int x = width /2 -28 ;int y = height -2 ;print_button (win,gettext ("Select" ), y, x, selected ==0 );print_button (win,gettext (" Exit " ), y, x +12 , selected ==1 );print_button (win,gettext (" Help " ), y, x +24 , selected ==2 ); +print_button (win,gettext (" Save " ), y, x +36 , selected ==3 ); +print_button (win,gettext (" Load " ), y, x +48 , selected ==4 );wmove (win, y, x +1 +12 * selected);wrefresh (win);
@@ -372,7 +374,7 @@ do_resize:case TAB :case KEY_RIGHT : button = ((key ==KEY_LEFT ? --button : ++button) <0 ) - ?2 : (button >2 ?0 : button); + ?4 : (button >4 ?0 : button);print_buttons (dialog, height, width, button);wrefresh (menu);
@@ -399,17 +401,17 @@ do_resize:return 2 ;case 's' :case 'y' : -return 3 ; +return 5 ;case 'n' : -return 4 ; +return 6 ;case 'm' : -return 5 ; +return 7 ;case ' ' : -return 6 ; +return 8 ;case '/' : -return 7 ; +return 9 ;case 'z' : -return 8 ; +return 10 ;case '\n' :return button; }
support/kconfig/lxdialog/textbox.c +97 -80
323 lines not on this page · raw message
support/kconfig/lxdialog/util.c +7 -0
@@ -23,6 +23,9 @@#include "dialog.h" +/* Needed in signal handler in mconf.c */ +int saved_x, saved_y; +struct dialog_info dlg;static void set_mono_theme (void )
@@ -273,6 +276,10 @@ int init_dialog(const char *backtitle)int height, width;initscr ();/* Init curses */ + +/* Get current cursor position for signal handler in mconf.c */ +getyx (stdscr, saved_y, saved_x); +getmaxyx (stdscr, height, width);if (height <19 || width <80 ) {endwin ();
support/kconfig/mconf.c +185 -84
434 lines not on this page · raw message
support/kconfig/menu.c +55 -20
150 lines not on this page · raw message
support/kconfig/merge_config.sh new file +142 -0
142 lines not on this page · raw message
support/kconfig/nconf.c +195 -206
205 lines not on this page · raw message
support/kconfig/nconf.gui.c +53 -16
69 lines not on this page · raw message
support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch +16 -16
Lines of this file are not shown. View the raw message.
support/kconfig/patches/02-cpp-comments-to-c-comments.patch +15 -15
Lines of this file are not shown. View the raw message.
support/kconfig/patches/03-change-config-option-prefix.patch +74 -100
174 lines not on this page · raw message
support/kconfig/patches/06-br-build-system-integration.patch +5 -5
Lines of this file are not shown. View the raw message.
support/kconfig/patches/09-implement-kconfig-probability.patch +5 -5
Lines of this file are not shown. View the raw message.
support/kconfig/patches/10-br-build-system.patch +4 -4
Lines of this file are not shown. View the raw message.
support/kconfig/patches/11-use-mktemp-for-lxdialog.patch +4 -4
Lines of this file are not shown. View the raw message.
support/kconfig/patches/12-fix-glade-file-path.patch +4 -4
Lines of this file are not shown. View the raw message.
support/kconfig/patches/14-support-out-of-tree-config.patch +19 -19
Lines of this file are not shown. View the raw message.
support/kconfig/patches/15-fix-qconf-moc-rule.patch new file +24 -0
Lines of this file are not shown. View the raw message.
support/kconfig/streamline_config.pl +237 -54
291 lines not on this page · raw message
support/kconfig/symbol.c +58 -8
66 lines not on this page · raw message
support/kconfig/zconf.hash.c_shipped +157 -116
273 lines not on this page · raw message
support/kconfig/zconf.lex.c_shipped renamed from support/kconfig/lex.zconf.c_shipped +10 -25
Lines of this file are not shown. View the raw message.
support/kconfig/zconf.tab.c_shipped +34 -35
69 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.9.5
Part of the diff is not shown here. View the raw message.
PATCH 1/2 support/kconfig: upgrade to 3.9-rc2
Quoted 11 lines · Thomas Petazzoni
Our kconfig code is updated to the version of kernel 3.9-rc2. No major issues during the migration, except:
* Some conflicts when applying 03-change-config-option-prefix.patch due to upstream kernel changes.
* The need of adding a new patch, 15-fix-qconf-moc-rule.patch, to fix the make rule that generates the moc file for the Qt-based interface.
Signed-off-by Thomas Petazzoni <[email protected]>
PATCH 1/2 support/kconfig: upgrade to 3.9-rc2
In reply to Thomas PetazzoniQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Our kconfig code is updated to the version of kernel 3.9-rc2. No major Thomas> issues during the migration, except:
Thomas> * Some conflicts when applying 03-change-config-option-prefix.patch
Thomas> due to upstream kernel changes.
Thomas> * The need of adding a new patch, 15-fix-qconf-moc-rule.patch, to fix
Thomas> the make rule that generates the moc file for the Qt-based
Thomas> interface.
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 support/kconfig: add support for olddefconfig
In reply to Thomas Petazzoniolddefconfig is a new target available in kconfig that allows to take an old .config file, and update it to the latest version of the code, without being asked for questions: it automatically assumes the default value for options whose value was not defined.
It for example allows to take a minimal defconfig, copy it as .config, and do 'make olddefconfig' to get the full .config.
--- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
Makefile +7 -1
@@ -58,7 +58,7 @@ export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setloca noconfig_targets:=menuconfig nconfig gconfig xconfig config oldconfig randconfig \ %_defconfig allyesconfig allnoconfig silentoldconfig release \ randpackageconfig allyespackageconfig allnopackageconfig \ - source-check print-version + source-check print-version olddefconfig # Strip quotes and then whitespaces qstrip=$(strip $(subst ",,$(1)))
@@ -693,6 +693,10 @@ silentoldconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @mkdir -p $(BUILD_DIR)/buildroot-config $(COMMON_CONFIG_ENV) $< --silentoldconfig $(CONFIG_CONFIG_IN) +olddefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile + @mkdir -p $(BUILD_DIR)/buildroot-config + $(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) + defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @mkdir -p $(BUILD_DIR)/buildroot-config @$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN)
@@ -758,6 +762,8 @@ help: @echo ' xconfig - interactive Qt-based configurator' @echo ' gconfig - interactive GTK-based configurator' @echo ' oldconfig - resolve any unresolved symbols in .config' + @echo ' silentoldconfig - Same as oldconfig, but quietly, additionally update deps' + @echo ' olddefconfig - Same as silentoldconfig but sets new symbols to their default value' @echo ' randconfig - New config with random answer to all options' @echo ' defconfig - New config with default answer to all options' @echo ' BR2_DEFCONFIG, if set, is used as input'
Signature · 1 line
1.7.9.5
PATCH 2/2 support/kconfig: add support for olddefconfig
Quoted 9 lines · Thomas Petazzoni
olddefconfig is a new target available in kconfig that allows to take an old .config file, and update it to the latest version of the code, without being asked for questions: it automatically assumes the default value for options whose value was not defined.
It for example allows to take a minimal defconfig, copy it as .config, and do 'make olddefconfig' to get the full .config.
Signed-off-by Thomas Petazzoni <[email protected]>
PATCH 2/2 support/kconfig: add support for olddefconfig
In reply to Thomas PetazzoniQuoted 8 lines · Thomas Petazzoni
olddefconfig is a new target available in kconfig that allows to take an old .config file, and update it to the latest version of the code, without being asked for questions: it automatically assumes the default value for options whose value was not defined.
It for example allows to take a minimal defconfig, copy it as .config, and do 'make olddefconfig' to get the full .config.
Committed, thanks.
--
Bye, Peter Korsgaard