From: John Crispin <john@openwrt.org>
Date: Sat, 3 May 2008 15:46:23 +0000 (+0000)
Subject: remove ugly hack for etrax
X-Git-Tag: reboot~26612
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;ds=sidebyside;h=c4f78ab7955a4de798cd051c1aa4173c2d817cb3;p=openwrt%2Fopenwrt.git

remove ugly hack for etrax

SVN-Revision: 11026
---

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 7a12f62d58..7897b1057d 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -26,13 +26,9 @@ 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
@@ -51,7 +47,7 @@ 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