include kernel-version.mk from kernel.mk so that a correct KERNEL_PATCHVER is always...

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

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 83d0d5e6ebffbe12856db6c55cb66d30c89cf995..0d3b40e16f44f73fcaf5e05b9c36876dd79200b6 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -6,21 +6,24 @@
 #
 KERNEL_BUILD:=1
 
-include $(INCLUDE_DIR)/kernel-version.mk
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/prereq.mk
 
+override MAKEFLAGS=
+
 GENERIC_LINUX_CONFIG:=$(GENERIC_PLATFORM_DIR)/config-$(shell [ -f "$(GENERIC_PLATFORM_DIR)/config-$(KERNEL_PATCHVER)" ] && echo "$(KERNEL_PATCHVER)" || echo template ) 
 LINUX_CONFIG_DIR ?= ./config$(shell [ -d "./config-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
 LINUX_CONFIG ?= $(LINUX_CONFIG_DIR)/default
 
--include $(GENERIC_LINUX_CONFIG)
--include $(LINUX_CONFIG)
-
-ifneq ($(CONFIG_ATM),)
-  FEATURES += atm
+ifneq ($(DUMP),)
+  TMP_CONFIG:=$(TMP_DIR)/.kconfig-$(BOARD)-$(KERNEL)
+  $(TMP_CONFIG): $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG)
+       $(SCRIPT_DIR)/config.pl + $^ > $@
+  -include $(TMP_CONFIG)
+  .SILENT: $(TMP_CONFIG)
 endif
+
 ifneq ($(CONFIG_PCI),)
   FEATURES += pci
 endif
@@ -30,9 +33,6 @@ endif
 ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
   FEATURES += pcmcia
 endif
-ifneq ($(CONFIG_VIDEO_DEV),)
-  FEATURES += video
-endif
 
 # remove duplicates
 FEATURES:=$(sort $(FEATURES))
@@ -93,15 +93,15 @@ define BuildKernel
        $(call Kernel/Prepare)
        touch $$@
 
-  $(STAMP_CONFIGURED): $(LINUX_DIR)/.prepared $(LINUX_CONFIG)
+  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_CONFIG) $(GENERIC_LINUX_CONFIG) $(TOPDIR)/.config
        $(call Kernel/Configure)
        touch $$@
 
-  $(LINUX_DIR)/.modules: $(LINUX_DIR)/.configured $(LINUX_DIR)/.config FORCE
+  $(LINUX_DIR)/.modules: $(STAMP_CONFIGURED) $(LINUX_DIR)/.config FORCE
        $(call Kernel/CompileModules)
        touch $$@
 
-  $(LINUX_DIR)/.image: $(LINUX_DIR)/.configured FORCE
+  $(LINUX_DIR)/.image: $(STAMP_CONFIGURED) FORCE
        $(call Kernel/CompileImage)
        touch $$@
        
@@ -164,15 +164,18 @@ endef
 $(eval $(call shexport,Target/Description))
 
 download: $(DL_DIR)/$(LINUX_SOURCE)
-prepare: $(LINUX_DIR)/.configured
+prepare: $(STAMP_CONFIGURED)
 compile: $(LINUX_DIR)/.modules
-menuconfig: $(LINUX_DIR)/.prepared FORCE
+       $(MAKE) -C image compile
+
+oldconfig menuconfig: $(STAMP_PREPARED) FORCE
        $(call Kernel/Configure)
        $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG) > $(LINUX_DIR)/.config
-       $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) menuconfig
+       $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $@
        $(SCRIPT_DIR)/config.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)
 
 install: $(LINUX_DIR)/.image
+       $(MAKE) -C image compile install
 
 clean: FORCE
        rm -f $(STAMP_DIR)/.linux-compile
@@ -185,4 +188,7 @@ rebuild: FORCE
        fi
        @$(MAKE) compile
 
+image-prereq:
+       $(SUBMAKE) -s -C image prereq
 
+prereq: image-prereq