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.
This commit is contained in:
Peter Korsgaard 2006-04-28 19:40:43 +00:00
parent dd01b4112c
commit 7bc4ad6e56

View File

@ -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 LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.12.0
endif endif
LINUX_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL) LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
@ -105,9 +105,9 @@ endif
touch $(LINUX_HEADERS_DIR)/.unpacked touch $(LINUX_HEADERS_DIR)/.unpacked
$(LINUX_HEADERS_DIR)/.patched: $(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) 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 endif
touch $(LINUX_HEADERS_DIR)/.patched touch $(LINUX_HEADERS_DIR)/.patched