From 24f21ae70f496f6b0d67adeba9c8ab54793decf2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 26 Nov 2007 14:54:15 +0000 Subject: [PATCH] Fix for old-style kernels (broken by r20018). Check old-style versions before including kernel-headers-new.makefile. --- .../kernel-headers-old-versions.makefile | 103 ++++++++++++++++++ .../kernel-headers-old.makefile | 96 ---------------- toolchain/kernel-headers/kernel-headers.mk | 2 + 3 files changed, 105 insertions(+), 96 deletions(-) create mode 100644 toolchain/kernel-headers/kernel-headers-old-versions.makefile diff --git a/toolchain/kernel-headers/kernel-headers-old-versions.makefile b/toolchain/kernel-headers/kernel-headers-old-versions.makefile new file mode 100644 index 0000000000..01e530084f --- /dev/null +++ b/toolchain/kernel-headers/kernel-headers-old-versions.makefile @@ -0,0 +1,103 @@ +############################################################# +# +# Setup the kernel headers. I include a generic package of +# kernel headers here, so you shouldn't need to include your +# own. Be aware these kernel headers _will_ get blown away +# by a 'make clean' so don't put anything sacred in here... +# +############################################################# +ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.4.25") +VERSION:=2 +PATCHLEVEL:=4 +SUBLEVEL:=25 +LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain +LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.25.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) +LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux +LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.25 +endif + +ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.4.27") +VERSION:=2 +PATCHLEVEL:=4 +SUBLEVEL:=27 +LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain +LINUX_HEADERS_CAT:=$(BZCAT) +LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.27.tar.bz2 +LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux +LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.27 +endif + +ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.4.29") +VERSION:=2 +PATCHLEVEL:=4 +SUBLEVEL:=29 +LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain +LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.29.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) +LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux +LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.29 +endif + +ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.4.31") +VERSION:=2 +PATCHLEVEL:=4 +SUBLEVEL:=31 +LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain +LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.31.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) +LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux +LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.31 +endif + +ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.9") +VERSION:=2 +PATCHLEVEL:=6 +SUBLEVEL:=9 +LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +LINUX_HEADERS_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ +LINUX_HEADERS_SOURCE:=linux-libc-headers-2.6.9.1.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) +LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux +LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.9.1 +endif + +ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.10") +VERSION:=2 +PATCHLEVEL:=6 +SUBLEVEL:=10 +LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +LINUX_HEADERS_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ +LINUX_HEADERS_SOURCE:=linux-libc-headers-2.6.10.0.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) +LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux +LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.10.0 +endif + +ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.11") +VERSION:=2 +PATCHLEVEL:=6 +SUBLEVEL:=11 +LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +LINUX_HEADERS_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ +LINUX_HEADERS_SOURCE:=linux-libc-headers-2.6.11.0.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) +LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux +LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.11.0 +endif + +ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.12") +VERSION:=2 +PATCHLEVEL:=6 +SUBLEVEL:=12 +LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +LINUX_HEADERS_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ +LINUX_HEADERS_SOURCE:=linux-libc-headers-2.6.12.0.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) +LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux +LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.12.0 +endif diff --git a/toolchain/kernel-headers/kernel-headers-old.makefile b/toolchain/kernel-headers/kernel-headers-old.makefile index f9db79070e..52fa68e6f3 100644 --- a/toolchain/kernel-headers/kernel-headers-old.makefile +++ b/toolchain/kernel-headers/kernel-headers-old.makefile @@ -6,102 +6,6 @@ # by a 'make clean' so don't put anything sacred in here... # ############################################################# -ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.4.25") -VERSION:=2 -PATCHLEVEL:=4 -SUBLEVEL:=25 -LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) -LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain -LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.25.tar.bz2 -LINUX_HEADERS_CAT:=$(BZCAT) -LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux -LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.25 -endif - -ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.4.27") -VERSION:=2 -PATCHLEVEL:=4 -SUBLEVEL:=27 -LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) -LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain -LINUX_HEADERS_CAT:=$(BZCAT) -LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.27.tar.bz2 -LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux -LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.27 -endif - -ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.4.29") -VERSION:=2 -PATCHLEVEL:=4 -SUBLEVEL:=29 -LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) -LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain -LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.29.tar.bz2 -LINUX_HEADERS_CAT:=$(BZCAT) -LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux -LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.29 -endif - -ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.4.31") -VERSION:=2 -PATCHLEVEL:=4 -SUBLEVEL:=31 -LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) -LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain -LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.31.tar.bz2 -LINUX_HEADERS_CAT:=$(BZCAT) -LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux -LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.31 -endif - -ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.9") -VERSION:=2 -PATCHLEVEL:=6 -SUBLEVEL:=9 -LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) -LINUX_HEADERS_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ -LINUX_HEADERS_SOURCE:=linux-libc-headers-2.6.9.1.tar.bz2 -LINUX_HEADERS_CAT:=$(BZCAT) -LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux -LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.9.1 -endif - -ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.10") -VERSION:=2 -PATCHLEVEL:=6 -SUBLEVEL:=10 -LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) -LINUX_HEADERS_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ -LINUX_HEADERS_SOURCE:=linux-libc-headers-2.6.10.0.tar.bz2 -LINUX_HEADERS_CAT:=$(BZCAT) -LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux -LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.10.0 -endif - -ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.11") -VERSION:=2 -PATCHLEVEL:=6 -SUBLEVEL:=11 -LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) -LINUX_HEADERS_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ -LINUX_HEADERS_SOURCE:=linux-libc-headers-2.6.11.0.tar.bz2 -LINUX_HEADERS_CAT:=$(BZCAT) -LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux -LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.11.0 -endif - -ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.12") -VERSION:=2 -PATCHLEVEL:=6 -SUBLEVEL:=12 -LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) -LINUX_HEADERS_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ -LINUX_HEADERS_SOURCE:=linux-libc-headers-2.6.12.0.tar.bz2 -LINUX_HEADERS_CAT:=$(BZCAT) -LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux -LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.12.0 -endif - # the old sanitized kernel-headers ifeq ($(LINUX_HEADERS_IS_KERNEL),n) diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index fef5afd899..81dcab1ac3 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -24,6 +24,8 @@ KERNEL_ARCH:=$(shell $(SHELL) -c "echo \"$(ARCH)\" | sed -e \"s/-.*//\" \ # assume old manually sanitized kernel-headers LINUX_HEADERS_IS_KERNEL=n +# this needs to be included before kernel-headers-new to set old-style mode +include toolchain/kernel-headers/kernel-headers-old-versions.makefile include toolchain/kernel-headers/kernel-headers-new.makefile include toolchain/kernel-headers/kernel-headers-old.makefile -- 2.30.2