diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-01-13 12:48:28 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-01-15 20:48:04 +0100 |
| commit | 21f540be4e247b4468d0e8adbf9e3a7575f8a085 (patch) | |
| tree | 8c572a31fbc5cbeecb015a3b15ce00debf03a074 /support/kconfig/patches/06-br-build-system-integration.patch | |
| parent | 8f8d414b61bf3b27a77ad38dfc493ae412b65471 (diff) | |
| download | buildroot-novena-21f540be4e247b4468d0e8adbf9e3a7575f8a085.tar.gz buildroot-novena-21f540be4e247b4468d0e8adbf9e3a7575f8a085.zip | |
kconfig: sync with linux-3.0
And drop unused make-write-deps patch.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'support/kconfig/patches/06-br-build-system-integration.patch')
| -rw-r--r-- | support/kconfig/patches/06-br-build-system-integration.patch | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/support/kconfig/patches/06-br-build-system-integration.patch b/support/kconfig/patches/06-br-build-system-integration.patch index 8a27e251e..feb166d36 100644 --- a/support/kconfig/patches/06-br-build-system-integration.patch +++ b/support/kconfig/patches/06-br-build-system-integration.patch @@ -1,40 +1,35 @@ --- - Makefile | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) -Index: config/Makefile +Index: kconfig/Makefile =================================================================== ---- config.orig/Makefile -+++ config/Makefile -@@ -174,18 +174,30 @@ - ifeq ($(MAKECMDGOALS),nconfig) +--- kconfig.orig/Makefile ++++ kconfig/Makefile +@@ -175,11 +175,11 @@ + + hostprogs-y := conf + +-ifeq ($(MAKECMDGOALS),nconfig) ++ifeq ($(MAKECMDGOALS),nconf) hostprogs-y += nconf endif -+ifeq ($(findstring nconf,$(MAKECMDGOALS)),nconf) -+ hostprogs-y += nconf -+endif - ifeq ($(MAKECMDGOALS),menuconfig) +-ifeq ($(MAKECMDGOALS),menuconfig) ++ifeq ($(MAKECMDGOALS),mconf) hostprogs-y += mconf endif -+ifeq ($(findstring mconf,$(MAKECMDGOALS)),mconf) -+ hostprogs-y += mconf -+endif - ifeq ($(MAKECMDGOALS),xconfig) +@@ -187,10 +187,10 @@ + hostprogs-y += kxgettext + endif + +-ifeq ($(MAKECMDGOALS),xconfig) ++ifeq ($(MAKECMDGOALS),qconf) qconf-target := 1 endif -+ifeq ($(findstring qconf,$(MAKECMDGOALS)),qconf) -+ qconf-target := 1 -+endif -+ - ifeq ($(MAKECMDGOALS),gconfig) +-ifeq ($(MAKECMDGOALS),gconfig) ++ifeq ($(MAKECMDGOALS),gconf) gconf-target := 1 endif -- -+ifeq ($(findstring gconf,$(MAKECMDGOALS)),gconf) -+ gconf-target := 1 -+endif - ifeq ($(qconf-target),1) - qconf-cxxobjs := qconf.o |