Commit 7c524dd0 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

Clean up our patches against kconfig 



Our kconfig-to-buildroot2.patch hasn't been kept up to date with all
the changes made into package/config, and a single patch wasn't very
practical to maintain all our changes. Therefore, this commit adds a
package/config/patches directory, which contains a Quilt series of
patches that correspond to our modifications to the kconfig mechanism.

The huge kconfig-to-buildroot2.patch has been split into 16 smaller
patches. The purpose of some of the modifications has been clearly
identified, while some others were not identified.

The 16 patches together do match exactly the old
kconfig-to-buildroot2.patch. We have been very careful in making sure
that we wouldn't loose any of our modifications.

The only modifications made are :

 * Instead of renaming the kernel Makefile to Makefile.kconfig and
   naming the Buildroot Makefile just 'Makefile', we instead keep the
   original package/config/Makefile from the kernel
   scripts/kconfig/Makefile and name the Buildroot Makefile
   package/config/Makefile.br. The main Buildroot Makefile is modified
   accordingly.

 * The documentation README.buildroot2 is updated to explain how to
   upgrade to a newer version of scripts/kconfig.

 * The kconfig-language.txt documentation is removed, as anybody can
   easily find it in the kernel sources so there's no need to
   duplicate it here.

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

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ export HOSTCFLAGS 


$(BUILD_DIR)/buildroot-config/%onf:

	mkdir -p $(@D)/lxdialog

	$(MAKE) CC="$(HOSTCC)" obj=$(@D) -C $(CONFIG) $(@F)

	$(MAKE) CC="$(HOSTCC)" obj=$(@D) -C $(CONFIG) -f Makefile.br $(@F)



xconfig: $(BUILD_DIR)/buildroot-config/qconf

	@mkdir -p $(BUILD_DIR)/buildroot-config

package/config/Makefile

+303 −53
Original line number Diff line number Diff line 
src := .

top_srcdir=../../

top_builddir=../../

srctree := .

obj ?= .



include Makefile.kconfig

#HOSTCFLAGS+=-Dinline="" -include foo.h

-include $(obj)/.depend

$(obj)/.depend: $(wildcard *.h *.c)

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) -MM *.c > $@ 2>/dev/null || :



__hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))

host-csingle := $(foreach m,$(__hostprogs),$(if $($(m)-objs),,$(m)))

host-cmulti := $(foreach m,$(__hostprogs),\

           $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m))))

host-cxxmulti := $(foreach m,$(__hostprogs),\

           $(if $($(m)-cxxobjs),$(m),$(if $($(m)-objs),)))

host-cobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-objs))))

host-cxxobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-cxxobjs))))



HOST_EXTRACFLAGS += -I$(obj)



$(host-csingle): %: %.c

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< $(HOST_LOADLIBES) -o $(obj)/$@



$(host-cmulti): %: $(host-cobjs) $(host-cshlib)

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs)) $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@



$(host-cxxmulti): %: $(host-cxxobjs) $(host-cobjs) $(host-cshlib)

	$(HOSTCXX) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs) $($(@F)-cxxobjs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@



$(obj)/%.o: %.c

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$(@F)) -c $< -o $@



$(obj)/%.o: $(obj)/%.c

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$(@F)) -c $< -o $@



$(obj)/%.o: %.cc

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$(@F)) -c $< -o $@



$(obj)/%:: $(src)/%_shipped

	$(Q)cat $< > $@



clean:

	$(Q)rm -f $(addprefix $(obj)/,$(clean-files))

distclean: clean

	$(Q)rm -f $(addprefix $(obj)/,$(lxdialog) $(conf-objs) $(mconf-objs) $(kxgettext-objs) \

		$(hostprogs-y) $(qconf-cxxobjs) $(qconf-objs) $(gconf-objs) \

		mconf .depend)



FORCE:

.PHONY: FORCE clean distclean
 
# ===========================================================================

# Kernel configuration targets

# These targets are used from top-level makefile



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



ifdef KBUILD_KCONFIG

Kconfig := $(KBUILD_KCONFIG)

else

Kconfig := arch/$(SRCARCH)/Kconfig

endif



xconfig: $(obj)/qconf

	$< $(Kconfig)



gconfig: $(obj)/gconf

	$< $(Kconfig)



menuconfig: $(obj)/mconf

	$< $(Kconfig)



config: $(obj)/conf

	$< $(Kconfig)



oldconfig: $(obj)/conf

	$< -o $(Kconfig)



silentoldconfig: $(obj)/conf

	$< -s $(Kconfig)



# 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)xgettext --default-domain=linux              \

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

	    --from-code=UTF-8                            \

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

	    --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`;               \

	    do                                           \

		echo "  GEN $$i";                        \

		$(obj)/kxgettext $$i                     \

		     >> $(obj)/config.pot;               \

	    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 $(obj)/config.pot



PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig



randconfig: $(obj)/conf

	$< -r $(Kconfig)



allyesconfig: $(obj)/conf

	$< -y $(Kconfig)



allnoconfig: $(obj)/conf

	$< -n $(Kconfig)



allmodconfig: $(obj)/conf

	$< -m $(Kconfig)



defconfig: $(obj)/conf

ifeq ($(KBUILD_DEFCONFIG),)

	$< -d $(Kconfig)

else

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

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

endif



%_defconfig: $(obj)/conf

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



# Help text used by make help

help:

	@echo  '  config	  - Update current config utilising a line-oriented 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  '  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  '  allnoconfig	  - New config where all options are answered with no'



# lxdialog stuff

check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh



# Use recursively expanded variables so we do not call gcc unless

# we really need to do so. (Do not call gcc as part of make mrproper)

HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)

HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))



HOST_EXTRACFLAGS += -DLOCALE





# ===========================================================================

# Shared Makefile for the various kconfig executables:

# conf:	  Used for defconfig, oldconfig and related targets

# mconf:  Used for the menuconfig target

#         Utilizes the lxdialog package

# qconf:  Used for the xconfig target

#         Based on QT which needs to be installed to compile it

# gconf:  Used for the gconfig target

#         Based on GTK which needs to be installed to compile it

# object files used by all kconfig flavours



lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o

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)

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



hostprogs-y := conf qconf gconf kxgettext



ifeq ($(MAKECMDGOALS),menuconfig)

	hostprogs-y += mconf

endif

ifeq ($(findstring mconf,$(MAKECMDGOALS)),mconf)

       hostprogs-y += mconf

endif



ifeq ($(MAKECMDGOALS),xconfig)

	qconf-target := 1

endif

ifeq ($(findstring qconf,$(MAKECMDGOALS)),qconf)

	qconf-target := 1

endif



ifeq ($(MAKECMDGOALS),gconfig)

	gconf-target := 1

endif

ifeq ($(findstring gconf,$(MAKECMDGOALS)),gconf)

	gconf-target := 1

endif



ifeq ($(qconf-target),1)

qconf-cxxobjs	:= qconf.o

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

endif



ifeq ($(gconf-target),1)

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

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 += config.pot linux.pot

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

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

clean-files += qconf qconf.o

clean-files += gconf gconf.o

clean-files += kconfig_load.o zconf.tab.o

clean-files += $(kxgettext-objs)



# Check that we have the required ncurses stuff installed for lxdialog (menuconfig)

PHONY += $(obj)/dochecklxdialog

$(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog

$(obj)/dochecklxdialog:

	$(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES)



always := dochecklxdialog



# Add environment specific flags

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.tab.o	:= -I$(src)



HOSTLOADLIBES_qconf	= $(KC_QT_LIBS) -ldl

HOSTCXXFLAGS_qconf.o	= $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK



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



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



ifeq ($(qconf-target),1)

$(obj)/.tmp_qtcheck: $(src)/Makefile

-include $(obj)/.tmp_qtcheck



# QT needs some extra effort...

$(obj)/.tmp_qtcheck:

	@set -e; echo "  CHECK   qt"; dir=""; pkg=""; \

	pkg-config --exists qt 2> /dev/null && pkg=qt; \

	pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \

	if [ -n "$$pkg" ]; then \

	  cflags="\$$(shell pkg-config $$pkg --cflags)"; \

	  libs="\$$(shell pkg-config $$pkg --libs)"; \

	  moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \

	  dir="$$(pkg-config $$pkg --variable=prefix)"; \

	else \

	  for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \

	    if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \

	  done; \

	  if [ -z "$$dir" ]; then \

	    echo "*"; \

	    echo "* Unable to find the QT3 installation. Please make sure that"; \

	    echo "* the QT3 development package is correctly installed and"; \

	    echo "* either install pkg-config or set the QTDIR environment"; \

	    echo "* variable to the correct location."; \

	    echo "*"; \

	    false; \

	  fi; \

	  libpath=$$dir/lib; lib=qt; osdir=""; \

	  $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \

	    osdir=x$$($(HOSTCXX) -print-multi-os-directory); \

	  test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \

	  test -f $$libpath/libqt-mt.so && lib=qt-mt; \

	  cflags="-I$$dir/include"; \

	  libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \

	  moc="$$dir/bin/moc"; \

	fi; \

	if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \

	  echo "*"; \

	  echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \

	  echo "*"; \

	  moc="/usr/bin/moc"; \

	fi; \

	echo "KC_QT_CFLAGS=$$cflags" > $@; \

	echo "KC_QT_LIBS=$$libs" >> $@; \

	echo "KC_QT_MOC=$$moc" >> $@

endif



$(obj)/gconf.o: $(obj)/.tmp_gtkcheck



ifeq ($(gconf-target),1)

-include $(obj)/.tmp_gtkcheck



# GTK needs some extra effort, too...

$(obj)/.tmp_gtkcheck:

	@if `pkg-config --exists gtk+-2.0 gmodule-2.0 libglade-2.0`; then		\

		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 "*";							\

			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 "*"; 								\

		false;									\

	fi

endif



$(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c



$(obj)/kconfig_load.o: $(obj)/lkc_defs.h



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



$(obj)/gconf.o: $(obj)/lkc_defs.h



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

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



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

	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



###

# 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

package/config/Makefile.br

0 → 100644
+53 −0
Original line number Diff line number Diff line 
src := .

top_srcdir=../../

top_builddir=../../

srctree := .

obj ?= .



include Makefile

#HOSTCFLAGS+=-Dinline="" -include foo.h

-include $(obj)/.depend

$(obj)/.depend: $(wildcard *.h *.c)

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) -MM *.c > $@ 2>/dev/null || :



__hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))

host-csingle := $(foreach m,$(__hostprogs),$(if $($(m)-objs),,$(m)))

host-cmulti := $(foreach m,$(__hostprogs),\

           $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m))))

host-cxxmulti := $(foreach m,$(__hostprogs),\

           $(if $($(m)-cxxobjs),$(m),$(if $($(m)-objs),)))

host-cobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-objs))))

host-cxxobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-cxxobjs))))



HOST_EXTRACFLAGS += -I$(obj)



$(host-csingle): %: %.c

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< $(HOST_LOADLIBES) -o $(obj)/$@



$(host-cmulti): %: $(host-cobjs) $(host-cshlib)

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs)) $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@



$(host-cxxmulti): %: $(host-cxxobjs) $(host-cobjs) $(host-cshlib)

	$(HOSTCXX) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs) $($(@F)-cxxobjs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@



$(obj)/%.o: %.c

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$(@F)) -c $< -o $@



$(obj)/%.o: $(obj)/%.c

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$(@F)) -c $< -o $@



$(obj)/%.o: %.cc

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$(@F)) -c $< -o $@



$(obj)/%:: $(src)/%_shipped

	$(Q)cat $< > $@



clean:

	$(Q)rm -f $(addprefix $(obj)/,$(clean-files))

distclean: clean

	$(Q)rm -f $(addprefix $(obj)/,$(lxdialog) $(conf-objs) $(mconf-objs) $(kxgettext-objs) \

		$(hostprogs-y) $(qconf-cxxobjs) $(qconf-objs) $(gconf-objs) \

		mconf .depend)



FORCE:

.PHONY: FORCE clean distclean

package/config/Makefile.kconfig

deleted100644 → 0
+0 −303
Original line number Diff line number Diff line 
# ===========================================================================

# Kernel configuration targets

# These targets are used from top-level makefile



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



ifdef KBUILD_KCONFIG

Kconfig := $(KBUILD_KCONFIG)

else

Kconfig := arch/$(SRCARCH)/Kconfig

endif



xconfig: $(obj)/qconf

	$< $(Kconfig)



gconfig: $(obj)/gconf

	$< $(Kconfig)



menuconfig: $(obj)/mconf

	$< $(Kconfig)



config: $(obj)/conf

	$< $(Kconfig)



oldconfig: $(obj)/conf

	$< -o $(Kconfig)



silentoldconfig: $(obj)/conf

	$< -s $(Kconfig)



# 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)xgettext --default-domain=linux              \

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

	    --from-code=UTF-8                            \

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

	    --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`;               \

	    do                                           \

		echo "  GEN $$i";                        \

		$(obj)/kxgettext $$i                     \

		     >> $(obj)/config.pot;               \

	    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 $(obj)/config.pot



PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig



randconfig: $(obj)/conf

	$< -r $(Kconfig)



allyesconfig: $(obj)/conf

	$< -y $(Kconfig)



allnoconfig: $(obj)/conf

	$< -n $(Kconfig)



allmodconfig: $(obj)/conf

	$< -m $(Kconfig)



defconfig: $(obj)/conf

ifeq ($(KBUILD_DEFCONFIG),)

	$< -d $(Kconfig)

else

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

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

endif



%_defconfig: $(obj)/conf

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



# Help text used by make help

help:

	@echo  '  config	  - Update current config utilising a line-oriented 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  '  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  '  allnoconfig	  - New config where all options are answered with no'



# lxdialog stuff

check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh



# Use recursively expanded variables so we do not call gcc unless

# we really need to do so. (Do not call gcc as part of make mrproper)

HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)

HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))



HOST_EXTRACFLAGS += -DLOCALE





# ===========================================================================

# Shared Makefile for the various kconfig executables:

# conf:	  Used for defconfig, oldconfig and related targets

# mconf:  Used for the menuconfig target

#         Utilizes the lxdialog package

# qconf:  Used for the xconfig target

#         Based on QT which needs to be installed to compile it

# gconf:  Used for the gconfig target

#         Based on GTK which needs to be installed to compile it

# object files used by all kconfig flavours



lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o

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)

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



hostprogs-y := conf qconf gconf kxgettext



ifeq ($(MAKECMDGOALS),menuconfig)

	hostprogs-y += mconf

endif

ifeq ($(findstring mconf,$(MAKECMDGOALS)),mconf)

       hostprogs-y += mconf

endif



ifeq ($(MAKECMDGOALS),xconfig)

	qconf-target := 1

endif

ifeq ($(findstring qconf,$(MAKECMDGOALS)),qconf)

	qconf-target := 1

endif



ifeq ($(MAKECMDGOALS),gconfig)

	gconf-target := 1

endif

ifeq ($(findstring gconf,$(MAKECMDGOALS)),gconf)

	gconf-target := 1

endif



ifeq ($(qconf-target),1)

qconf-cxxobjs	:= qconf.o

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

endif



ifeq ($(gconf-target),1)

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

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 += config.pot linux.pot

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

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

clean-files += qconf qconf.o

clean-files += gconf gconf.o

clean-files += kconfig_load.o zconf.tab.o

clean-files += $(kxgettext-objs)



# Check that we have the required ncurses stuff installed for lxdialog (menuconfig)

PHONY += $(obj)/dochecklxdialog

$(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog

$(obj)/dochecklxdialog:

	$(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES)



always := dochecklxdialog



# Add environment specific flags

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.tab.o	:= -I$(src)



HOSTLOADLIBES_qconf	= $(KC_QT_LIBS) -ldl

HOSTCXXFLAGS_qconf.o	= $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK



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



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



ifeq ($(qconf-target),1)

$(obj)/.tmp_qtcheck: $(src)/Makefile

-include $(obj)/.tmp_qtcheck



# QT needs some extra effort...

$(obj)/.tmp_qtcheck:

	@set -e; echo "  CHECK   qt"; dir=""; pkg=""; \

	pkg-config --exists qt 2> /dev/null && pkg=qt; \

	pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \

	if [ -n "$$pkg" ]; then \

	  cflags="\$$(shell pkg-config $$pkg --cflags)"; \

	  libs="\$$(shell pkg-config $$pkg --libs)"; \

	  moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \

	  dir="$$(pkg-config $$pkg --variable=prefix)"; \

	else \

	  for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \

	    if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \

	  done; \

	  if [ -z "$$dir" ]; then \

	    echo "*"; \

	    echo "* Unable to find the QT3 installation. Please make sure that"; \

	    echo "* the QT3 development package is correctly installed and"; \

	    echo "* either install pkg-config or set the QTDIR environment"; \

	    echo "* variable to the correct location."; \

	    echo "*"; \

	    false; \

	  fi; \

	  libpath=$$dir/lib; lib=qt; osdir=""; \

	  $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \

	    osdir=x$$($(HOSTCXX) -print-multi-os-directory); \

	  test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \

	  test -f $$libpath/libqt-mt.so && lib=qt-mt; \

	  cflags="-I$$dir/include"; \

	  libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \

	  moc="$$dir/bin/moc"; \

	fi; \

	if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \

	  echo "*"; \

	  echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \

	  echo "*"; \

	  moc="/usr/bin/moc"; \

	fi; \

	echo "KC_QT_CFLAGS=$$cflags" > $@; \

	echo "KC_QT_LIBS=$$libs" >> $@; \

	echo "KC_QT_MOC=$$moc" >> $@

endif



$(obj)/gconf.o: $(obj)/.tmp_gtkcheck



ifeq ($(gconf-target),1)

-include $(obj)/.tmp_gtkcheck



# GTK needs some extra effort, too...

$(obj)/.tmp_gtkcheck:

	@if `pkg-config --exists gtk+-2.0 gmodule-2.0 libglade-2.0`; then		\

		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 "*";							\

			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 "*"; 								\

		false;									\

	fi

endif



$(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c



$(obj)/kconfig_load.o: $(obj)/lkc_defs.h



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



$(obj)/gconf.o: $(obj)/lkc_defs.h



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

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



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

	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



###

# 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

package/config/README.buildroot2

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

This is a copy of the kconfig code in the kernel (currently 2.6.30) tweaked

to suit Buildroot.



To update:

	cp -r /usr/src/linux/scripts/kconfig package/config.new

	cd package/config.new

	cp /usr/src/linux/Documentation/kbuild/kconfig-language.txt .

	patch -p1 < ../config/kconfig-to-buildroot2.patch

	mv Makefile Makefile.kconfig

	cp ../config/README.buildroot2 .

	cp ../config/foo.h .

	cp ../config/Makefile .

	cp ../config/kconfig-to-buildroot2.patch .

	cp -a ../config/patches ../config/README.buildroot2 .

	quilt push -a

	# Fix any conflict

	cd ..

	rm -rf config

	mv config.new config
@@ -19,4 +15,6 @@ Then verify the toplevel targets work: 
	config

	defconfig

	menuconfig

	xconfig

	gconfig

	oldconfig