Commit 24f21ae7 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Fix for old-style kernels (broken by r20018). Check old-style versions before 

including kernel-headers-new.makefile.
parent 9066fc28

toolchain/kernel-headers/kernel-headers-old-versions.makefile

0 → 100644
+103 −0
Original line number Diff line number Diff line 
#############################################################

#

# 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

toolchain/kernel-headers/kernel-headers-old.makefile

+0 −96
Original line number Diff line number Diff line
@@ -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)

toolchain/kernel-headers/kernel-headers.mk

+2 −0
Original line number Diff line number Diff line
@@ -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