Commit 193c312f authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- move setting of determination whether we use a full kernel vs. sanitized... 

- move setting of determination whether we use a full kernel vs. sanitized headers into the generic part
parent e41b98b1

toolchain/kernel-headers/kernel-headers-new.makefile

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
# full kernel tarballs >= 2.6.19.1

#

#############################################################

LINUX_HEADERS_IS_KERNEL=n



ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.19.1")

VERSION:=2

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

+0 −8
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 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

LINUX_HEADERS_IS_KERNEL=n

endif



ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.4.27")
@@ -29,7 +28,6 @@ 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

LINUX_HEADERS_IS_KERNEL=n

endif



ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.4.29")
@@ -42,7 +40,6 @@ 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

LINUX_HEADERS_IS_KERNEL=n

endif



ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.4.31")
@@ -55,7 +52,6 @@ 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

LINUX_HEADERS_IS_KERNEL=n

endif



ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.9")
@@ -68,7 +64,6 @@ 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

LINUX_HEADERS_IS_KERNEL=n

endif



ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.10")
@@ -81,7 +76,6 @@ 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

LINUX_HEADERS_IS_KERNEL=n

endif



ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.11")
@@ -94,7 +88,6 @@ 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

LINUX_HEADERS_IS_KERNEL=n

endif



ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.12")
@@ -107,7 +100,6 @@ 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

LINUX_HEADERS_IS_KERNEL=n

endif

toolchain/kernel-headers/kernel-headers.mk

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ KERNEL_ARCH:=$(shell $(SHELL) -c "echo \"$(ARCH)\" | sed -e \"s/-.*//\" \ 
	-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \

	-e s/sh2.*/sh/ -e s/sh3.*/sh/ -e s/sh4.*/sh/")



# assume old manually sanitized kernel-headers

LINUX_HEADERS_IS_KERNEL=n



include toolchain/kernel-headers/kernel-headers-new.makefile

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