kumquat-buildroot/package/config/patches/06-br-build-system-integration.patch

---
 Makefile |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

Index: config/Makefile
===================================================================
--- config.orig/Makefile
+++ config/Makefile
@@ -174,18 +174,30 @@
 ifeq ($(MAKECMDGOALS),nconfig)
 	hostprogs-y += nconf
 endif
+ifeq ($(findstring nconf,$(MAKECMDGOALS)),nconf)
+       hostprogs-y += nconf
+endif
 
 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
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2010-08-21 15:59:10 +02:00			`---`
Add support for the new nconf configuration tool Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2010-08-21 17:21:40 +02:00			`Makefile \| 14 +++++++++++++-`
			`1 file changed, 13 insertions(+), 1 deletion(-)`
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2010-08-21 15:59:10 +02:00
Add support for the new nconf configuration tool Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2010-08-21 17:21:40 +02:00			`Index: config/Makefile`
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2010-08-21 15:59:10 +02:00			`===================================================================`
Add support for the new nconf configuration tool Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2010-08-21 17:21:40 +02:00			`--- config.orig/Makefile`
			`+++ config/Makefile`
package/config: rebase against 2.6.37-rc1 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> 2011-02-02 11:48:58 +01:00			`@@ -174,18 +174,30 @@`
Add support for the new nconf configuration tool Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2010-08-21 17:21:40 +02:00			`ifeq ($(MAKECMDGOALS),nconfig)`
			`hostprogs-y += nconf`
			`endif`
			`+ifeq ($(findstring nconf,$(MAKECMDGOALS)),nconf)`
			`+ hostprogs-y += nconf`
			`+endif`

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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2010-08-21 15:59:10 +02:00			`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`