X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fkernel-headers%2FMakefile;h=f95c8b95a92dd2465afaf66847f7b56ab5f828d4;hb=b5faddf0c3773ccf23f1a94d0578908d243137ae;hp=3e2cd2ae8678074d1956870660dd8aaf9814c14a;hpb=318409fc3f68c0f6c6cdf52bb706bcba2a94e16b;p=openwrt.git

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 3e2cd2ae86..f95c8b95a9 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -5,50 +5,46 @@
 # 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 -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)))
+  KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+		ARCH=i386 \
+		CONFIG_SHELL=$(BASH)
+else
+  KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+		ARCH=$(LINUX_KARCH) \
+		CONFIG_SHELL=$(BASH)
+endif
+
 define Build/Configure
-	-$(CP) ./files/config.$(LINUX_KARCH) $(PKG_BUILD_DIR)/.config
-	$(MAKE) -C $(PKG_BUILD_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/version.h
+	yes '' | $(KMAKE) oldconfig
+	$(KMAKE) include/linux/version.h include/asm
+	$(call Build/Configure/$(ARCH))
 endef
 
 define Build/Compile