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 4cd0199..d51f91d 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -15,28 +15,55 @@ PKG_SOURCE_URL=$(LINUX_SITE)
 
 PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux-$(PKG_VERSION)
 
 
 PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux-$(PKG_VERSION)
 

+LINUX_DIR:=$(PKG_BUILD_DIR)
+KERNEL_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)
+override QUILT:=
+

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

+include $(INCLUDE_DIR)/kernel-defaults.mk

 
 

-define Build/Prepare
+
+define Build/Prepare/cris

        mkdir -p $(TOOLCHAIN_BUILD_DIR)
        bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS)
        mkdir -p $(TOOLCHAIN_BUILD_DIR)
        bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS)

-       $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/generic-$(KERNEL)/patches
+       $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/generic_2.6
+       $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/cris
+       ln -sf $(PKG_BUILD_DIR)/include/asm-cris/arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch
+       ln -sf $(PKG_BUILD_DIR)/arch/cris/arch-v10 $(PKG_BUILD_DIR)/arch/cris/arch

        $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
        ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
 endef
 
 define Build/Configure/powerpc
        $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
        ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
 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
 
 endef
 

-define Build/Configure
-       yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
-               ARCH=$(LINUX_KARCH) \
-               CONFIG_SHELL=$(BASH) \
-               oldconfig include/linux/version.h include/asm
+ifneq (,$(findstring uml,$(BOARD)))
+  LINUX_KARCH:=$(ARCH)
+endif
+
+KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+       ARCH=$(LINUX_KARCH) \
+       CONFIG_SHELL=$(BASH)
+
+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
 
        $(call Build/Configure/$(ARCH))
 endef
 

+define Build/Configure
+endef
+

 define Build/Compile
 endef
 
 define Build/Compile
 endef