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

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

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 4cd0199e78ea8c0a514b5ec0641930dd64380864..dbeb144c951139f7382ec1d720d79a5fb5cfb0ce 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -14,6 +14,7 @@ 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
 
@@ -26,14 +27,24 @@ define Build/Prepare
 endef
 
 define Build/Configure/powerpc
-       $(CP) $(PKG_BUILD_DIR)/include/asm-powerpc/* $(PKG_BUILD_DIR)/include/asm-ppc/
+       $(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
 
-define Build/Configure
-       yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
+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=$(BASH) \
-               oldconfig include/linux/version.h include/asm
+               CONFIG_SHELL=$(BASH)
+endif
+
+define Build/Configure
+       yes '' | $(KMAKE) oldconfig
+       $(KMAKE) include/linux/version.h include/asm
        $(call Build/Configure/$(ARCH))
 endef