generic-2.6/2.6.30: nuke unnecessary patch

[openwrt/openwrt.git] / include / kernel-build.mk

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index b6d2cf5efbb6ee27274d8cb42b15f8b75516a1e7..d48f8b9f53c8255d98767a7f92eadf97a0f7a1f9 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -11,6 +11,7 @@ ifneq ($(DUMP),1)
   all: compile
 endif
 
+export QUILT=1
 STAMP_PREPARED:=$(LINUX_DIR)/.prepared
 STAMP_CONFIGURED:=$(LINUX_DIR)/.configured
 include $(INCLUDE_DIR)/download.mk
@@ -76,29 +77,22 @@ define BuildKernel
   compile: $(LINUX_DIR)/.modules
        $(MAKE) -C image compile TARGET_BUILD=
 
-  oldconfig menuconfig: $(STAMP_PREPARED) FORCE
+  oldconfig menuconfig: $(STAMP_PREPARED) $(STAMP_CHECKED) FORCE
        [ -e "$(LINUX_CONFIG)" ] || touch "$(LINUX_CONFIG)"
        $(LINUX_CONFCMD) > $(LINUX_DIR)/.config
        touch $(LINUX_CONFIG)
-       $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
-       $(SCRIPT_DIR)/kconfig.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)
+       $(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
+       $(SCRIPT_DIR)/kconfig.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(if $(LINUX_SUBCONFIG),$(LINUX_SUBCONFIG),$(LINUX_CONFIG))
        $(Kernel/Configure)
 
   install: $(LINUX_DIR)/.image
-       TARGET_BUILD="" $(MAKE) -C image compile install
+       +$(MAKE) -C image compile install TARGET_BUILD=
 
   clean: FORCE
        rm -rf $(KERNEL_BUILD_DIR)
 
-  rebuild: FORCE
-       @$(MAKE) mostlyclean
-       @if [ -f $(LINUX_KERNEL) ]; then \
-               $(MAKE) clean; \
-       fi
-       @$(MAKE) compile
-
   image-prereq:
-       @$(NO_TRACE_MAKE) -s -C image prereq TARGET_BUILD=
+       @+$(NO_TRACE_MAKE) -s -C image prereq TARGET_BUILD=
 
   prereq: image-prereq