Commit 52a142a6 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

Bump package/config to 2.6.36-rc1 



The goal is to be able to use savedefconfig to generate minimal
defconfig files.

Four of our patches are removed since the modifications have been
merged upstream. The new nconf configuration utility has appeared.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 7c524dd0

package/config/.gitignore

+23 −9
Original line number Diff line number Diff line 
/conf

/mconf

/qconf

/qconf.moc

/.tmp_qtcheck

/lkc_defs.h

/lex.zconf.c

/zconf.hash.c

/zconf.tab.c
 
#

# Generated files

#

config*

lex.*.c

*.tab.c

*.tab.h

zconf.hash.c

*.moc

lkc_defs.h

gconf.glade.h

*.pot

*.mo



#

# configuration programs

#

conf

mconf

nconf

qconf

gconf

kxgettext

package/config/Makefile

+79 −20
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
# Kernel configuration targets

# These targets are used from top-level makefile



PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config

PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \

	localmodconfig localyesconfig



ifdef KBUILD_KCONFIG

Kconfig := $(KBUILD_KCONFIG)
@@ -20,13 +21,56 @@ menuconfig: $(obj)/mconf 
	$< $(Kconfig)



config: $(obj)/conf

	$< --oldaskconfig $(Kconfig)



nconfig: $(obj)/nconf

	$< $(Kconfig)



oldconfig: $(obj)/conf

	$< -o $(Kconfig)

	$< --$@ $(Kconfig)



silentoldconfig: $(obj)/conf

	$< -s $(Kconfig)

	$(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

	$(Q)mkdir -p include/generated

	$(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .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



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
@@ -51,44 +95,50 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h 
	$(Q)rm -f arch/um/Kconfig.arch

	$(Q)rm -f $(obj)/config.pot



PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig

PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig



randconfig: $(obj)/conf

	$< -r $(Kconfig)

allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf

	$< --$@ $(Kconfig)



allyesconfig: $(obj)/conf

	$< -y $(Kconfig)

PHONY += listnewconfig oldnoconfig savedefconfig defconfig



allnoconfig: $(obj)/conf

	$< -n $(Kconfig)

listnewconfig oldnoconfig: $(obj)/conf

	$< --$@ $(Kconfig)



allmodconfig: $(obj)/conf

	$< -m $(Kconfig)

savedefconfig: $(obj)/conf

	$< --$@=defconfig $(Kconfig)



defconfig: $(obj)/conf

ifeq ($(KBUILD_DEFCONFIG),)

	$< -d $(Kconfig)

	$< --defconfig $(Kconfig)

else

	@echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"

	$(Q)$< -D arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)

	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)

endif



%_defconfig: $(obj)/conf

	$(Q)$< -D arch/$(SRCARCH)/configs/$@ $(Kconfig)

	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)



# Help text used by make help

help:

	@echo  '  config	  - Update current config utilising a line-oriented program'

	@echo  '  nconfig         - Update current config utilising a ncurses menu based program'

	@echo  '  menuconfig	  - Update current config utilising a menu based program'

	@echo  '  xconfig	  - Update current config utilising a QT based front-end'

	@echo  '  gconfig	  - Update current config utilising a GTK based front-end'

	@echo  '  oldconfig	  - Update current config utilising a provided .config as base'

	@echo  '  localmodconfig  - Update current config disabling modules not loaded'

	@echo  '  localyesconfig  - Update current config converting local mods to core'

	@echo  '  silentoldconfig - Same as oldconfig, but quietly, additionally update deps'

	@echo  '  randconfig	  - New config with random answer to all options'

	@echo  '  defconfig	  - New config with default answer to all options'

	@echo  '  allmodconfig	  - New config selecting modules when possible'

	@echo  '  allyesconfig	  - New config where all options are accepted with yes'

	@echo  '  defconfig	  - New config with default from ARCH supplied defconfig'

	@echo  '  savedefconfig   - Save current config as ./defconfig (minimal config)'

	@echo  '  allnoconfig	  - New config where all options are answered with no'

	@echo  '  allyesconfig	  - New config where all options are accepted with yes'

	@echo  '  allmodconfig	  - New config selecting modules when possible'

	@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)'



# lxdialog stuff

check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
@@ -104,6 +154,8 @@ HOST_EXTRACFLAGS += -DLOCALE 
# ===========================================================================

# Shared Makefile for the various kconfig executables:

# conf:	  Used for defconfig, oldconfig and related targets

# nconf:  Used for the nconfig target.

#         Utilizes ncurses

# mconf:  Used for the menuconfig target

#         Utilizes the lxdialog package

# qconf:  Used for the xconfig target
@@ -117,10 +169,15 @@ lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o 


conf-objs	:= conf.o  zconf.tab.o

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



hostprogs-y := conf qconf gconf kxgettext



ifeq ($(MAKECMDGOALS),nconfig)

	hostprogs-y += nconf

endif



ifeq ($(MAKECMDGOALS),menuconfig)

	hostprogs-y += mconf

endif
@@ -156,6 +213,7 @@ clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ 
clean-files += config.pot linux.pot

clean-files += conf $(conf-objs)

clean-files += mconf $(mconf-objs)

clean-files += nconf $(nconf-objs)

clean-files += qconf qconf.o

clean-files += gconf gconf.o

clean-files += kconfig_load.o zconf.tab.o
@@ -183,6 +241,7 @@ HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl 
HOSTCFLAGS_gconf.o	= `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \

                          -D LKC_DIRECT_LINK



HOSTLOADLIBES_nconf	= -lmenu -lpanel -lncurses

$(obj)/qconf.o: $(obj)/.tmp_qtcheck



ifeq ($(qconf-target),1)

package/config/README.buildroot2

+1 −1
Original line number Diff line number Diff line 
This is a copy of the kconfig code in the kernel (currently 2.6.30) tweaked

This is a copy of the kconfig code in the kernel (currently 2.6.36-rc1) tweaked

to suit Buildroot.



To update:

package/config/conf.c

+131 −91
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <string.h>

#include <time.h>

#include <unistd.h>

#include <getopt.h>

#include <sys/stat.h>

#include <sys/time.h>
@@ -19,16 +20,21 @@ 
static void conf(struct menu *menu);

static void check_conf(struct menu *menu);



enum {

	ask_all,

	ask_new,

	ask_silent,

	set_default,

	set_yes,

	set_mod,

	set_no,

	set_random

} input_mode = ask_all;

enum input_mode {

	oldaskconfig,

	silentoldconfig,

	oldconfig,

	allnoconfig,

	allyesconfig,

	allmodconfig,

	alldefconfig,

	randconfig,

	defconfig,

	savedefconfig,

	listnewconfig,

	oldnoconfig,

} input_mode = oldaskconfig;



char *defconfig_file;



static int indent = 1;
@@ -38,14 +44,14 @@ static int conf_cnt; 
static char line[128];

static struct menu *rootEntry;



static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");



static const char *get_help(struct menu *menu)

static void print_help(struct menu *menu)

{

	if (menu_has_help(menu))

		return _(menu_get_help(menu));

	else

		return nohelp_text;

	struct gstr help = str_new();



	menu_get_ext_help(menu, &help);



	printf("\n%s\n", str_get(&help));

	str_free(&help);

}



static void strip(char *str)
@@ -93,16 +99,16 @@ static int conf_askvalue(struct symbol *sym, const char *def) 
	}



	switch (input_mode) {

	case ask_new:

	case ask_silent:

	case oldconfig:

	case silentoldconfig:

		if (sym_has_value(sym)) {

			printf("%s\n", def);

			return 0;

		}

		check_stdin();

	case ask_all:

	case oldaskconfig:

		fflush(stdout);

		fgets(line, 128, stdin);

		xfgets(line, 128, stdin);

		return 1;

	default:

		break;
@@ -121,7 +127,7 @@ static int conf_askvalue(struct symbol *sym, const char *def) 
	return 1;

}



int conf_string(struct menu *menu)

static int conf_string(struct menu *menu)

{

	struct symbol *sym = menu->sym;

	const char *def;
@@ -140,7 +146,7 @@ int conf_string(struct menu *menu) 
		case '?':

			/* print help */

			if (line[1] == '\n') {

				printf("\n%s\n", get_help(menu));

				print_help(menu);

				def = NULL;

				break;

			}
@@ -156,14 +162,12 @@ int conf_string(struct menu *menu) 
static int conf_sym(struct menu *menu)

{

	struct symbol *sym = menu->sym;

	int type;

	tristate oldval, newval;



	while (1) {

		printf("%*s%s ", indent - 1, "", _(menu->prompt->text));

		if (sym->name)

			printf("(%s) ", sym->name);

		type = sym_get_type(sym);

		putchar('[');

		oldval = sym_get_tristate_value(sym);

		switch (oldval) {
@@ -220,7 +224,7 @@ static int conf_sym(struct menu *menu) 
		if (sym_set_tristate_value(sym, newval))

			return 0;

help:

		printf("\n%s\n", get_help(menu));

		print_help(menu);

	}

}
@@ -228,11 +232,9 @@ static int conf_choice(struct menu *menu) 
{

	struct symbol *sym, *def_sym;

	struct menu *child;

	int type;

	bool is_new;



	sym = menu->sym;

	type = sym_get_type(sym);

	is_new = !sym_has_value(sym);

	if (sym_is_changable(sym)) {

		conf_sym(menu);
@@ -294,20 +296,20 @@ static int conf_choice(struct menu *menu) 
			printf("?");

		printf("]: ");

		switch (input_mode) {

		case ask_new:

		case ask_silent:

		case oldconfig:

		case silentoldconfig:

			if (!is_new) {

				cnt = def;

				printf("%d\n", cnt);

				break;

			}

			check_stdin();

		case ask_all:

		case oldaskconfig:

			fflush(stdout);

			fgets(line, 128, stdin);

			xfgets(line, 128, stdin);

			strip(line);

			if (line[0] == '?') {

				printf("\n%s\n", get_help(menu));

				print_help(menu);

				continue;

			}

			if (!line[0])
@@ -331,7 +333,7 @@ static int conf_choice(struct menu *menu) 
		if (!child)

			continue;

		if (line[strlen(line) - 1] == '?') {

			printf("\n%s\n", get_help(child));

			print_help(child);

			continue;

		}

		sym_set_choice_value(sym, child->sym);
@@ -360,7 +362,10 @@ static void conf(struct menu *menu) 


		switch (prop->type) {

		case P_MENU:

			if (input_mode == ask_silent && rootEntry != menu) {

			if ((input_mode == silentoldconfig ||

			     input_mode == listnewconfig ||

			     input_mode == oldnoconfig) &&

			    rootEntry != menu) {

				check_conf(menu);

				return;

			}
@@ -418,17 +423,39 @@ static void check_conf(struct menu *menu) 
	if (sym && !sym_has_value(sym)) {

		if (sym_is_changable(sym) ||

		    (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {

			if (input_mode == listnewconfig) {

				if (sym->name && !sym_is_choice_value(sym)) {

					printf("CONFIG_%s\n", sym->name);

				}

			} else {

				if (!conf_cnt++)

					printf(_("*\n* Restart config...\n*\n"));

				rootEntry = menu_get_parent_menu(menu);

				conf(rootEntry);

			}

		}

	}



	for (child = menu->list; child; child = child->next)

		check_conf(child);

}



static struct option long_opts[] = {

	{"oldaskconfig",    no_argument,       NULL, oldaskconfig},

	{"oldconfig",       no_argument,       NULL, oldconfig},

	{"silentoldconfig", no_argument,       NULL, silentoldconfig},

	{"defconfig",       optional_argument, NULL, defconfig},

	{"savedefconfig",   required_argument, NULL, savedefconfig},

	{"allnoconfig",     no_argument,       NULL, allnoconfig},

	{"allyesconfig",    no_argument,       NULL, allyesconfig},

	{"allmodconfig",    no_argument,       NULL, allmodconfig},

	{"alldefconfig",    no_argument,       NULL, alldefconfig},

	{"randconfig",      no_argument,       NULL, randconfig},

	{"listnewconfig",   no_argument,       NULL, listnewconfig},

	{"oldnoconfig",     no_argument,       NULL, oldnoconfig},

	{NULL, 0, NULL, 0}

};



int main(int ac, char **av)

{

	int opt;
@@ -439,32 +466,17 @@ int main(int ac, char **av) 
	bindtextdomain(PACKAGE, LOCALEDIR);

	textdomain(PACKAGE);



	while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) {

	while ((opt = getopt_long_only(ac, av, "", long_opts, NULL)) != -1) {

		input_mode = (enum input_mode)opt;

		switch (opt) {

		case 'o':

			input_mode = ask_silent;

			break;

		case 's':

			input_mode = ask_silent;

		case silentoldconfig:

			sync_kconfig = 1;

			break;

		case 'd':

			input_mode = set_default;

			break;

		case 'D':

			input_mode = set_default;

		case defconfig:

		case savedefconfig:

			defconfig_file = optarg;

			break;

		case 'n':

			input_mode = set_no;

			break;

		case 'm':

			input_mode = set_mod;

			break;

		case 'y':

			input_mode = set_yes;

			break;

		case 'r':

		case randconfig:

		{

			struct timeval now;

			unsigned int seed;
@@ -477,17 +489,12 @@ int main(int ac, char **av) 


			seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1));

			srand(seed);



			input_mode = set_random;

			break;

		}

		case 'h':

			printf(_("See README for usage info\n"));

			exit(0);

			break;

		default:

		case '?':

			fprintf(stderr, _("See README for usage info\n"));

			exit(1);

			break;

		}

	}

	if (ac == optind) {
@@ -500,7 +507,7 @@ int main(int ac, char **av) 
		name = conf_get_configname();

		if (stat(name, &tmpstat)) {

			fprintf(stderr, _("***\n"

				"*** You have not yet configured Buildroot!\n"

				"*** You have not yet configured your Buildroot!\n"

				"*** (missing .config file \"%s\")\n"

				"***\n"

				"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
@@ -511,7 +518,7 @@ int main(int ac, char **av) 
	}



	switch (input_mode) {

	case set_default:

	case defconfig:

		if (!defconfig_file)

			defconfig_file = conf_get_default_confname();

		if (conf_read(defconfig_file)) {
@@ -521,25 +528,32 @@ int main(int ac, char **av) 
			exit(1);

		}

		break;

	case ask_silent:

	case ask_all:

	case ask_new:

	case savedefconfig:

		conf_read(NULL);

		break;

	case set_no:

	case set_mod:

	case set_yes:

	case set_random:

	case silentoldconfig:

	case oldaskconfig:

	case oldconfig:

	case listnewconfig:

	case oldnoconfig:

		conf_read(NULL);

		break;

	case allnoconfig:

	case allyesconfig:

	case allmodconfig:

	case alldefconfig:

	case randconfig:

		name = getenv("KCONFIG_ALLCONFIG");

		if (name && !stat(name, &tmpstat)) {

			conf_read_simple(name, S_DEF_USER);

			break;

		}

		switch (input_mode) {

		case set_no:	 name = "allno.config"; break;

		case set_mod:	 name = "allmod.config"; break;

		case set_yes:	 name = "allyes.config"; break;

		case set_random: name = "allrandom.config"; break;

		case allnoconfig:	name = "allno.config"; break;

		case allyesconfig:	name = "allyes.config"; break;

		case allmodconfig:	name = "allmod.config"; break;

		case alldefconfig:	name = "alldef.config"; break;

		case randconfig:	name = "allrandom.config"; break;

		default: break;

		}

		if (!stat(name, &tmpstat))
@@ -564,33 +578,42 @@ int main(int ac, char **av) 
	}



	switch (input_mode) {

	case set_no:

	case allnoconfig:

		conf_set_all_new_symbols(def_no);

		break;

	case set_yes:

	case allyesconfig:

		conf_set_all_new_symbols(def_yes);

		break;

	case set_mod:

	case allmodconfig:

		conf_set_all_new_symbols(def_mod);

		break;

	case set_random:

	case alldefconfig:

		conf_set_all_new_symbols(def_default);

		break;

	case randconfig:

		conf_set_all_new_symbols(def_random);

		break;

	case set_default:

	case defconfig:

		conf_set_all_new_symbols(def_default);

		break;

	case ask_new:

	case ask_all:

	case savedefconfig:

		break;

	case oldaskconfig:

		rootEntry = &rootmenu;

		conf(&rootmenu);

		input_mode = ask_silent;

		input_mode = silentoldconfig;

		/* fall through */

	case ask_silent:

	case oldconfig:

	case listnewconfig:

	case oldnoconfig:

	case silentoldconfig:

		/* Update until a loop caused no more changes */

		do {

			conf_cnt = 0;

			check_conf(&rootmenu);

		} while (conf_cnt);

		} while (conf_cnt &&

			 (input_mode != listnewconfig &&

			  input_mode != oldnoconfig));

		break;

	}
@@ -606,7 +629,13 @@ int main(int ac, char **av) 
			fprintf(stderr, _("\n*** Error during update of the Buildroot configuration.\n\n"));

			return 1;

		}

	} else {

	} else if (input_mode == savedefconfig) {

		if (conf_write_defconfig(defconfig_file)) {

			fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),

			        defconfig_file);

			return 1;

		}

	} else if (input_mode != listnewconfig) {

		if (conf_write(NULL)) {

			fprintf(stderr, _("\n*** Error during writing of the Buildroot configuration.\n\n"));

			exit(1);
@@ -618,3 +647,14 @@ int main(int ac, char **av) 
	}

	return 0;

}

/*

 * Helper function to facilitate fgets() by Jean Sacren.

 */

void xfgets(str, size, in)

	char *str;

	int size;

	FILE *in;

{

	if (fgets(str, size, in) == NULL)

		fprintf(stderr, "\nError in reading or end of file.\n");

}

package/config/confdata.c

+242 −107

File changed.

Preview size limit exceeded, changes collapsed.