From 7bc4ad6e56d2083a3adb71705dbdd236fc352eb5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 28 Apr 2006 19:40:43 +0000 Subject: 0000851: toolchain/kernel-headers: Use LINUX_HEADERS_VERSION instead of LINUX_VERSION. Use LINUX_HEADERS_VERSION instead of LINUX_VERSION as that variable is used for the actual kernel version used which might be different than the headers version. E.G. LINUX_VERSION is set in the target/device/* files. If this version doesn't match the selected kernel headers version the patches won't be applied. --- toolchain/kernel-headers/kernel-headers.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 299ac383c..bad07d909 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -87,7 +87,7 @@ LINUX_HEADERS_SOURCE:=linux-libc-headers-2.6.12.0.tar.bz2 LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.12.0 endif -LINUX_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL) +LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL) LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux @@ -105,9 +105,9 @@ endif touch $(LINUX_HEADERS_DIR)/.unpacked $(LINUX_HEADERS_DIR)/.patched: $(LINUX_HEADERS_DIR)/.unpacked - toolchain/patch-kernel.sh $(LINUX_HEADERS_DIR) toolchain/kernel-headers linux-libc-headers-$(LINUX_VERSION)\*.patch + toolchain/patch-kernel.sh $(LINUX_HEADERS_DIR) toolchain/kernel-headers linux-libc-headers-$(LINUX_HEADERS_VERSION)\*.patch ifeq ($(strip $(ARCH)),nios2) - toolchain/patch-kernel.sh $(LINUX_HEADERS_DIR) toolchain/kernel-headers linux-libc-headers-$(LINUX_VERSION)-nios2nommu.patch.conditional + toolchain/patch-kernel.sh $(LINUX_HEADERS_DIR) toolchain/kernel-headers linux-libc-headers-$(LINUX_HEADERS_VERSION)-nios2nommu.patch.conditional endif touch $(LINUX_HEADERS_DIR)/.patched -- cgit v1.2.3