aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-03-03 12:54:08 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-03-03 12:54:08 +0000
commit67849ab20d4ce5d90cfbc7f5144bd6172ab82ba3 (patch)
treeae788ad615021d75f5ae065149d483664a96566d /toolchain
parent8178f2785d73065f37bbb337c187ab9269f00d29 (diff)
downloadupstream-67849ab20d4ce5d90cfbc7f5144bd6172ab82ba3.tar.gz
upstream-67849ab20d4ce5d90cfbc7f5144bd6172ab82ba3.tar.bz2
upstream-67849ab20d4ce5d90cfbc7f5144bd6172ab82ba3.zip
[toolchain] cleanup the 2.6.33 and later kernels kernel-headers installation
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19962 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/kernel-headers/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 4c4d4273fa..63687cbf50 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -33,6 +33,12 @@ 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) \
KBUILD_HAVE_NLS=no \
@@ -105,11 +111,7 @@ 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
-ifeq ($(CONFIG_LINUX_2_6_33),y)
- $(KMAKE) include/linux/version.h arch/$(LINUX_KARCH)/include/asm
-else
- $(KMAKE) include/linux/version.h include/asm
-endif
+ $(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/. \