From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 24 May 2010 20:38:36 +0000 (+0000)
Subject: toolchain/kernel-headers: simplify linux headers installation (remove legacy hacks... 
X-Git-Tag: v19.07.0-rc1~30459
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7ca97b03d9e3f8128b0f62680d10a25798076ee9;p=openwrt%2Fstaging%2Fhauke.git

toolchain/kernel-headers: simplify linux headers installation (remove legacy hacks, cleanup)

SVN-Revision: 21567
---

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 8241bdc5c5..104b44c197 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -35,36 +35,29 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
   LINUX_HAS_HEADERS_INSTALL:=y
 endif
 
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1)
-  LINUX_ASM_INCLUDES:=arch/$(LINUX_KARCH)/include/asm
-else
-  LINUX_ASM_INCLUDES:=include/asm
-endif
-
 KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
 	ARCH=$(LINUX_KARCH) \
+	CC="$(KERNEL_CC)" \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CROSS_COMPILE=$(TARGET_CROSS) \
 	KBUILD_HAVE_NLS=no \
 	CONFIG_SHELL=$(BASH)
 
-define Host/Prepare/pre/powerpc
-	if [ -d $(HOST_BUILD_DIR)/include/asm-ppc ]; then \
-		mkdir -p $(PKG_BUILD_DIR)/include/asm-powerpc/; \
-		$(CP) $(HOST_BUILD_DIR)/include/asm-ppc/* $(HOST_BUILD_DIR)/include/asm-powerpc/; \
-		rm -rf $(HOST_BUILD_DIR)/include/asm-ppc; \
-		ln -s $(HOST_BUILD_DIR)/include/asm-powerpc $(HOST_BUILD_DIR)/include/asm-ppc; \
-	fi
-endef
-
 ifneq ($(LINUX_HAS_HEADERS_INSTALL),)
   define Host/Prepare/all
 	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr
 	$(KMAKE) \
-		CROSS_COMPILE=$(TARGET_CROSS) \
 		INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/" \
 		headers_install
+	if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
+		$(CP) \
+			$(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
+			$(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
+	fi
   endef
 else
   define Host/Prepare/all
+	$(KMAKE) include/linux/version.h include/asm
 	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include
 	cp -pLR $(HOST_BUILD_DIR)/include/asm $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/
 	cp -pLR $(HOST_BUILD_DIR)/include/asm-generic $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/
@@ -84,7 +77,6 @@ endef
 define Host/Prepare/post/cris
 	$(CP) \
 		$(HOST_BUILD_DIR)/include/linux/user.h \
-		$(HOST_BUILD_DIR)/include/linux/autoconf.h \
 		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/linux/
 	ln -snf $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch-v10/arch \
 		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch
@@ -113,13 +105,6 @@ define Host/Prepare
 	ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux
 	$(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile
 	yes '' | $(KMAKE) oldconfig
-	$(KMAKE) include/linux/version.h $(LINUX_ASM_INCLUDES)
-	if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
-		$(CP) \
-			$(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
-			$(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
-	fi
-	$(call Host/Prepare/pre/$(ARCH))
 	$(call Host/Prepare/all)
 	$(call Host/Prepare/post/$(ARCH))
 endef