add kernel_headers dependency on target/linux/generic-2.*

[openwrt/openwrt.git] / toolchain / kernel-headers / Makefile

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 21f56ea571c9c98a0d0874b8035034b51792a99f..dbeb144c951139f7382ec1d720d79a5fb5cfb0ce 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -14,23 +14,38 @@ PKG_SOURCE=$(LINUX_SOURCE)
 PKG_SOURCE_URL=$(LINUX_SITE)
 
 PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux-$(PKG_VERSION)
+PKG_FILE_DEPEND:=$(GENERIC_PLATFORM_DIR)
 
 include $(INCLUDE_DIR)/host-build.mk
 
 define Build/Prepare
        mkdir -p $(TOOLCHAIN_BUILD_DIR)
-       bzcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS)
+       bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS)
        $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/generic-$(KERNEL)/patches
        $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
        ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
 endef
 
-define Build/Configure
-       -$(CP) ./files/config.$(LINUX_KARCH) $(PKG_BUILD_DIR)/.config
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+define Build/Configure/powerpc
+       $(CP) $(PKG_BUILD_DIR)/include/asm-ppc/* $(PKG_BUILD_DIR)/include/asm-powerpc/
+       rm -rf $(PKG_BUILD_DIR)/include/asm-ppc
+       mv $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc
+endef
+
+ifneq (,$(findstring uml,$(BOARD)))
+  KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+               ARCH=i386 \
+               CONFIG_SHELL=$(BASH)
+else
+  KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
                ARCH=$(LINUX_KARCH) \
-               CONFIG_SHELL=$(shell which bash) \
-               defconfig include/linux/version.h
+               CONFIG_SHELL=$(BASH)
+endif
+
+define Build/Configure
+       yes '' | $(KMAKE) oldconfig
+       $(KMAKE) include/linux/version.h include/asm
+       $(call Build/Configure/$(ARCH))
 endef
 
 define Build/Compile