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

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

* 'kconfig-for-40' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  xconfig: merge code path to conf_write()
  kconfig: do not record timestamp in .config
  gconfig: Hide unused left treeview when start up the interface
  gconfig: enable rules hint for main treeviews
  MAINTAINERS: Update KCONFIG entry
  kconfig-language: add to hints
  kconfig: Document the new "visible if" syntax
  kconfig: quiet commands when V=0
  kconfig: change update-po-config to reflect new layout of arch/um
  kconfig: make update-po-config work in KBUILD_OUTPUT
  kconfig: rearrange clean-files
  kconfig: change gconf to modify hostprogs-y like nconf and mconf
  kconfig: change qconf to modify hostprogs-y like nconf and mconf
  kconfig: only build kxgettext when needed
  nconfig: Silence unused return values from wattrset
  kconfig: Do not record timestamp in auto.conf and autoconf.h
  kconfig: get rid of unused flags
  kconfig: allow multiple inclusion of the same file
  kconfig: Avoid buffer underrun in choice input
parents 9720d753 d49e4687

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -3917,6 +3917,10 @@ S: Flandernstrasse 101 
S: D-73732 Esslingen

S: Germany



N: Roman Zippel

E: zippel@linux-m68k.org

D: AFFS and HFS filesystems, m68k maintainer, new kernel configuration in 2.5



N: Leonard N. Zubkoff

W: http://www.dandelion.com/Linux/

D: BusLogic SCSI driver

Documentation/kbuild/kconfig-language.txt

+31 −1
Original line number Diff line number Diff line
@@ -113,6 +113,13 @@ applicable everywhere (see syntax). 
	That will limit the usefulness but on the other hand avoid

	the illegal configurations all over.



- limiting menu display: "visible if" <expr>

  This attribute is only applicable to menu blocks, if the condition is

  false, the menu block is not displayed to the user (the symbols

  contained there can still be selected by other symbols, though). It is

  similar to a conditional "prompt" attribude for individual menu

  entries. Default value of "visible" is true.



- numerical ranges: "range" <symbol> <symbol> ["if" <expr>]

  This allows to limit the range of possible input values for int

  and hex symbols. The user can only input a value which is larger than
@@ -303,7 +310,8 @@ menu: 
	"endmenu"



This defines a menu block, see "Menu structure" above for more

information. The only possible options are dependencies.

information. The only possible options are dependencies and "visible"

attributes.



if:
@@ -381,3 +389,25 @@ config FOO 


limits FOO to module (=m) or disabled (=n).



Kconfig symbol existence

~~~~~~~~~~~~~~~~~~~~~~~~

The following two methods produce the same kconfig symbol dependencies

but differ greatly in kconfig symbol existence (production) in the

generated config file.



case 1:



config FOO

	tristate "about foo"

	depends on BAR



vs. case 2:



if BAR

config FOO

	tristate "about foo"

endif



In case 1, the symbol FOO will always exist in the config file (given

no other dependencies).  In case 2, the symbol FOO will only exist in

the config file if BAR is enabled.

Documentation/kbuild/kconfig.txt

+0 −5
Original line number Diff line number Diff line
@@ -48,11 +48,6 @@ KCONFIG_OVERWRITECONFIG 
If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not

break symlinks when .config is a symlink to somewhere else.



KCONFIG_NOTIMESTAMP

--------------------------------------------------

If this environment variable exists and is non-null, the timestamp line

in generated .config files is omitted.



______________________________________________________________________

Environment variables for '{allyes/allmod/allno/rand}config'

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -3597,10 +3597,9 @@ F: Documentation/hwmon/k8temp 
F:	drivers/hwmon/k8temp.c



KCONFIG

M:	Roman Zippel <zippel@linux-m68k.org>

M:	Michal Marek <mmarek@suse.cz>

L:	linux-kbuild@vger.kernel.org

Q:	http://patchwork.kernel.org/project/linux-kbuild/list/

S:	Maintained

S:	Odd Fixes

F:	Documentation/kbuild/kconfig-language.txt

F:	scripts/kconfig/

scripts/kconfig/Makefile

+23 −15
Original line number Diff line number Diff line
@@ -80,11 +80,12 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h 
	$(Q)xgettext --default-domain=linux                         \

	    --add-comments --keyword=_ --keyword=N_                 \

	    --from-code=UTF-8                                       \

	    --files-from=scripts/kconfig/POTFILES.in     \

	    --files-from=$(srctree)/scripts/kconfig/POTFILES.in     \

	    --directory=$(srctree) --directory=$(objtree)           \

	    --output $(obj)/config.pot

	$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot

	$(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch

	$(Q)(for i in `ls arch/*/Kconfig`;               \

	$(Q)ln -fs Kconfig.x86 arch/um/Kconfig

	$(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \

	    do                                           \

		echo "  GEN $$i";                        \

		$(obj)/kxgettext $$i                     \
@@ -92,7 +93,7 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h 
	    done )

	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \

	    --output $(obj)/linux.pot

	$(Q)rm -f arch/um/Kconfig.arch

	$(Q)rm -f $(srctree)/arch/um/Kconfig

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



PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
@@ -168,8 +169,11 @@ 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

qconf-cxxobjs	:= qconf.o

qconf-objs	:= kconfig_load.o zconf.tab.o

gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o



hostprogs-y := conf qconf gconf kxgettext

hostprogs-y := conf



ifeq ($(MAKECMDGOALS),nconfig)

	hostprogs-y += nconf
@@ -179,6 +183,10 @@ ifeq ($(MAKECMDGOALS),menuconfig) 
	hostprogs-y += mconf

endif



ifeq ($(MAKECMDGOALS),update-po-config)

	hostprogs-y += kxgettext

endif



ifeq ($(MAKECMDGOALS),xconfig)

	qconf-target := 1

endif
@@ -188,16 +196,15 @@ endif 




ifeq ($(qconf-target),1)

qconf-cxxobjs	:= qconf.o

qconf-objs	:= kconfig_load.o zconf.tab.o

	hostprogs-y += qconf

endif



ifeq ($(gconf-target),1)

gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o

	hostprogs-y += gconf

endif



clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck \

		   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h

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     += mconf qconf gconf nconf

clean-files     += config.pot linux.pot
@@ -321,11 +328,12 @@ $(obj)/%.moc: $(src)/%.h 
	$(KC_QT_MOC) -i $< -o $@



$(obj)/lkc_defs.h: $(src)/lkc_proto.h

	sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'

	$(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'



# Extract gconf menu items for I18N support

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

	intltool-extract --type=gettext/glade $(obj)/gconf.glade

	$(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \

	$(obj)/gconf.glade



###

# The following requires flex/bison/gperf

CRA Git | Maintained and supported by SUSTech CRA and CCSE