Commit b4e2ed32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kconfig changes from Michal Marek:
 - kconfig Makefile portability fixes
 - menuconfig/nconfig help pager usability fix
 - .gitignore cleanup
 - quoting fix in scripts/config
 - Makefile prints errors to stderr
 - support for arbitrarily log lines in .config
 - fix oldnoconfig description in 'make help'

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: Document oldnoconfig to what it really does
  nconf: add u, d command keys in scroll windows
  menuconfig: add u, d, q command keys in text boxes
  scripts/config: fix double-quotes un-escaping
  kconfig: Print errors to stderr in the Makefile
  kconfig: allow long lines in config file
  kconfig: remove lkc_defs.h from .gitignore and dontdiff
  xconfig: add quiet rule for moc
  xconfig: use pkgconfig to find moc
  kconfig: fix check-lxdialog for DLL platforms
  kconfig: check ncursesw headers first in check-lxdialog
  kconfig/nconf: fix compile with ncurses reentrant API
parents c66d7077 67d34a6a

Documentation/dontdiff

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ keywords.c 
ksym.c*

ksym.h*

kxgettext

lkc_defs.h

lex.c

lex.*.c

linux

scripts/config

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ while [ "$1" != "" ] ; do 
				V="${V/#CONFIG_$ARG=/}"

				V="${V/#\"/}"

				V="${V/%\"/}"

				V="${V/\\\"/\"}"

				V="${V//\\\"/\"}"

				echo "${V}"

			fi

		fi

scripts/kconfig/.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ config* 
*.tab.h

zconf.hash.c

*.moc

lkc_defs.h

gconf.glade.h

*.pot

*.mo

scripts/kconfig/Makefile

+22 −19
Original line number Diff line number Diff line
@@ -114,7 +114,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  '  oldnoconfig     - Same as silentoldconfig but sets new symbols to their default value'



# lxdialog stuff

check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
@@ -234,12 +234,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=""; \
@@ -260,8 +260,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" >> $@; \
@@ -279,17 +279,17 @@ $(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
@@ -298,8 +298,11 @@ $(obj)/zconf.tab.o: $(obj)/zconf.lex.c $(obj)/zconf.hash.c 


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



$(obj)/%.moc: $(src)/%.h

	$(KC_QT_MOC) -i $< -o $@

quiet_cmd_moc = MOC     $@

      cmd_moc = $(KC_QT_MOC) -i $< -o $@



$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck

	$(call cmd,moc)



# Extract gconf menu items for I18N support

$(obj)/gconf.glade.h: $(obj)/gconf.glade

scripts/kconfig/confdata.c

+59 −2
Original line number Diff line number Diff line
@@ -182,10 +182,66 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) 
	return 0;

}



#define LINE_GROWTH 16

static int add_byte(int c, char **lineptr, size_t slen, size_t *n)

{

	char *nline;

	size_t new_size = slen + 1;

	if (new_size > *n) {

		new_size += LINE_GROWTH - 1;

		new_size *= 2;

		nline = realloc(*lineptr, new_size);

		if (!nline)

			return -1;



		*lineptr = nline;

		*n = new_size;

	}



	(*lineptr)[slen] = c;



	return 0;

}



static ssize_t compat_getline(char **lineptr, size_t *n, FILE *stream)

{

	char *line = *lineptr;

	size_t slen = 0;



	for (;;) {

		int c = getc(stream);



		switch (c) {

		case '\n':

			if (add_byte(c, &line, slen, n) < 0)

				goto e_out;

			slen++;

			/* fall through */

		case EOF:

			if (add_byte('\0', &line, slen, n) < 0)

				goto e_out;

			*lineptr = line;

			if (slen == 0)

				return -1;

			return slen;

		default:

			if (add_byte(c, &line, slen, n) < 0)

				goto e_out;

			slen++;

		}

	}



e_out:

	line[slen-1] = '\0';

	*lineptr = line;

	return -1;

}



int conf_read_simple(const char *name, int def)

{

	FILE *in = NULL;

	char line[1024];

	char   *line = NULL;

	size_t  line_asize = 0;

	char *p, *p2;

	struct symbol *sym;

	int i, def_flags;
@@ -247,7 +303,7 @@ load: 
		}

	}



	while (fgets(line, sizeof(line), in)) {

	while (compat_getline(&line, &line_asize, in) != -1) {

		conf_lineno++;

		sym = NULL;

		if (line[0] == '#') {
@@ -335,6 +391,7 @@ setsym: 
			cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);

		}

	}

	free(line);

	fclose(in);



	if (modules_sym)

CRA Git | Maintained and supported by SUSTech CRA and CCSE