The merge of ppc (32-bit headers) and powerpc (previously 64-bit only headers) has...

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

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 7a12f62d588d58f06b368ad466f3d991819b5671..6e02fe9888f953acf1115f233c453d2f629dbc94 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -12,6 +12,7 @@ BUILD_DIR := $(KERNEL_BUILD_DIR)
 STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
 BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 override QUILT:=
+override CONFIG_AUTOREBUILD=
 
 include $(INCLUDE_DIR)/kernel.mk
 
@@ -26,19 +27,17 @@ LINUX_DIR := $(PKG_BUILD_DIR)
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
-define Build/Prepare/cris
-       mkdir -p $(BUILD_DIR_TOOLCHAIN)
-       bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(BUILD_DIR_TOOLCHAIN) $(TAR_OPTIONS)
-       $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax/patches/generic_2.6
-       $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax/patches/cris
-       ln -sf arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch
-       ln -sf arch-v10 $(PKG_BUILD_DIR)/arch/cris/arch
+define Build/Configure/cris
+       ln -sf $(PKG_BUILD_DIR)/include/asm-cris/arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch
+       ln -sf $(PKG_BUILD_DIR)/include/asm-cris/arch-v10 $(PKG_BUILD_DIR)/arch/cris/arch
 endef
 
 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
-       ln -s $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc
+       if [ -d $(PKG_BUILD_DIR)/include/asm-ppc ]; then \
+               $(CP) $(PKG_BUILD_DIR)/include/asm-ppc/* $(PKG_BUILD_DIR)/include/asm-powerpc/; \
+               rm -rf $(PKG_BUILD_DIR)/include/asm-ppc; \
+               ln -s $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc; \
+       fi
 endef
 
 ifneq (,$(findstring uml,$(BOARD)))
@@ -51,11 +50,16 @@ KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
        CONFIG_SHELL=$(BASH)
 
 define Build/Prepare
-       $(if $(Build/Prepare/$(ARCH)),$(Build/Prepare/$(ARCH)),$(call Kernel/Prepare/Default))
+       $(call Kernel/Prepare/Default)
        $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
        ln -sf linux-$(LINUX_VERSION) $(LINUX_HEADERS_DIR)
        yes '' | $(KMAKE) oldconfig
        $(KMAKE) include/linux/version.h include/asm
+       if [ -d $(PKG_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
+               $(CP) \
+                       $(PKG_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
+                       $(PKG_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
+       fi
        $(call Build/Configure/$(ARCH))
 endef