X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=toolchain%2Fkernel-headers%2FMakefile;h=27dcacd80a408ea6d1724eb35afa13b13e3e9485;hp=a242ea23ac7e404524e2a9af9dfb3687e249f7c5;hb=39cff50e2e6e806fa25e32965888f99cd3ed1402;hpb=f52d66ff00b24111f87c274d3d7085ef2e1d27b1

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index a242ea23ac..27dcacd80a 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -5,53 +5,44 @@
 # See /LICENSE for more information.
 #
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME=kernel-headers
-PKG_VERSION=2.4.32
+PKG_VERSION=$(LINUX_VERSION)
 
-PKG_SOURCE=linux-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL= \
-		http://www.de.kernel.org/pub/linux/kernel/v2.4 \
-		http://www.fi.kernel.org/pub/linux/kernel/v2.4 \
-		http://www.fr.kernel.org/pub/linux/kernel/v2.4 \
-		http://www.kernel.org/pub/linux/kernel/v2.4
-PKG_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
+PKG_SOURCE=$(LINUX_SOURCE)
+PKG_SOURCE_URL=$(LINUX_SITE)
 
 PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-	-e 's/mipsel/mips/' \
-	-e 's/mipseb/mips/' \
-	-e 's/powerpc/ppc/' \
-	-e 's/sh[234]/sh/' \
-	-e 's/armeb/arm/' \
-)
-
-
 define Build/Prepare
 	mkdir -p $(TOOLCHAIN_BUILD_DIR)
-	bzcat $(DL_DIR)/$(PKG_SOURCE) | tar $(TAR_WILDCARDS) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS) - \
-		linux-$(PKG_VERSION)/include \
-		linux-$(PKG_VERSION)/Makefile \
-		linux-$(PKG_VERSION)/Rules.make \
-		linux-$(PKG_VERSION)/arch/$(LINUX_KARCH)/Makefile \
-		linux-$(PKG_VERSION)/scripts \
-		linux-$(PKG_VERSION)/arch/$(LINUX_KARCH)/config*.in \
-		linux-$(PKG_VERSION)/*/*/Config.in \
-		linux-$(PKG_VERSION)/*/Config.in
-	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile 
+	bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS)
+	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/generic-$(KERNEL)/patches
+	$(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-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
+
+ifneq (,$(findstring uml,$(BOARD)))
+  LINUX_KARCH:=$(ARCH)
+endif
+
+KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+	ARCH=$(LINUX_KARCH) \
+	CONFIG_SHELL=$(BASH)
+
 define Build/Configure
-	-$(CP) ./files/config.$(LINUX_KARCH) $(PKG_BUILD_DIR)/.config
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		ARCH=$(LINUX_KARCH) \
-		CONFIG_SHELL=$(shell which bash) \
-		oldconfig include/linux/version.h
+	yes '' | $(KMAKE) oldconfig
+	$(KMAKE) include/linux/version.h include/asm
+	$(call Build/Configure/$(ARCH))
 endef
 
 define Build/Compile