From 193c312f222be9e3bd5db150e4138644d5e8f6f1 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 22 Dec 2006 10:37:22 +0000 Subject: [PATCH] - move setting of determination whether we use a full kernel vs. sanitized headers into the generic part --- toolchain/kernel-headers/kernel-headers-new.makefile | 1 - toolchain/kernel-headers/kernel-headers-old.makefile | 8 -------- toolchain/kernel-headers/kernel-headers.mk | 3 +++ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/toolchain/kernel-headers/kernel-headers-new.makefile b/toolchain/kernel-headers/kernel-headers-new.makefile index dceadac4eb..070aa25fea 100644 --- a/toolchain/kernel-headers/kernel-headers-new.makefile +++ b/toolchain/kernel-headers/kernel-headers-new.makefile @@ -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 diff --git a/toolchain/kernel-headers/kernel-headers-old.makefile b/toolchain/kernel-headers/kernel-headers-old.makefile index 8357e82c68..6b490cab1e 100644 --- a/toolchain/kernel-headers/kernel-headers-old.makefile +++ b/toolchain/kernel-headers/kernel-headers-old.makefile @@ -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 diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 1ce6ec437a..6dc024a1aa 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -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 -- 2.30.2