no need to call compile,install on the kernel-headers dir - this gets rid of another...

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

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 57887ad..d51f91d 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -17,6 +17,8 @@ PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux-$(PKG_VERSION)
 
 LINUX_DIR:=$(PKG_BUILD_DIR)
 KERNEL_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)
 
 LINUX_DIR:=$(PKG_BUILD_DIR)
 KERNEL_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)

+override QUILT:=
+

 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 


@@ -32,18 +34,6 @@ define Build/Prepare/cris
        ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
 endef
 
        ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
 endef
 

-ifdef Build/Prepare/$(ARCH)
-define Build/Prepare
-       $(call Build/Prepare/$(ARCH))
-endef
-else
-define Build/Prepare
-       $(call Kernel/Prepare/Default)
-       $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
-       ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
-endef
-endif
-

 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
 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


@@ -58,12 +48,22 @@ KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
        ARCH=$(LINUX_KARCH) \
        CONFIG_SHELL=$(BASH)
 
        ARCH=$(LINUX_KARCH) \
        CONFIG_SHELL=$(BASH)
 

-define Build/Configure
+define Build/Prepare/Default
+       $(call Kernel/Prepare/Default)
+       $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
+       ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
+endef
+
+define Build/Prepare
+       $(if $(Build/Prepare/$(ARCH)),$(Build/Prepare/$(ARCH)),$(Build/Prepare/Default))

        yes '' | $(KMAKE) oldconfig
        $(KMAKE) include/linux/version.h include/asm
        $(call Build/Configure/$(ARCH))
 endef
 
        yes '' | $(KMAKE) oldconfig
        $(KMAKE) include/linux/version.h include/asm
        $(call Build/Configure/$(ARCH))
 endef
 

+define Build/Configure
+endef
+

 define Build/Compile
 endef
 
 define Build/Compile
 endef