diff options
| author | Eric Andersen <andersen@codepoet.org> | 2007-09-11 19:07:12 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2007-09-11 19:07:12 +0000 |
| commit | 206711de6aeee186ae71b5f9aba6dc619ddb257a (patch) | |
| tree | 3f59c645ed89de88a2fadba3dee2f500a8f6925c | |
| parent | 64bd6a625c67ba08a7bc786fafc63054fa782fa0 (diff) | |
bump up a few version numbers. kill dead 2.6.19 option.
accomodate powerpc64
| -rw-r--r-- | toolchain/kernel-headers/Config.in | 11 | ||||
| -rw-r--r-- | toolchain/kernel-headers/kernel-headers-new.makefile | 12 | ||||
| -rw-r--r-- | toolchain/kernel-headers/kernel-headers.mk | 1 |
3 files changed, 10 insertions, 14 deletions
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 808433a7a..1d27021a6 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -40,10 +40,6 @@ choice depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED bool "Linux 2.6.12 kernel headers" - config BR2_KERNEL_HEADERS_2_6_19_2 - depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED - bool "Linux 2.6.19.2 kernel headers" - config BR2_KERNEL_HEADERS_2_6_20 depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED bool "Linux 2.6.20 kernel headers" @@ -91,9 +87,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "2.6.9" if BR2_KERNEL_HEADERS_2_6_9 default "2.6.11" if BR2_KERNEL_HEADERS_2_6_11 default "2.6.12" if BR2_KERNEL_HEADERS_2_6_12 - default "2.6.19.2" if BR2_KERNEL_HEADERS_2_6_19_2 - default "2.6.20.4" if BR2_KERNEL_HEADERS_2_6_20 - default "2.6.21.5" if BR2_KERNEL_HEADERS_2_6_21 - default "2.6.22.1" if BR2_KERNEL_HEADERS_2_6_22 + default "2.6.20.19" if BR2_KERNEL_HEADERS_2_6_20 + default "2.6.21.7" if BR2_KERNEL_HEADERS_2_6_21 + default "2.6.22.6" if BR2_KERNEL_HEADERS_2_6_22 endmenu diff --git a/toolchain/kernel-headers/kernel-headers-new.makefile b/toolchain/kernel-headers/kernel-headers-new.makefile index 67c1114f0..be2e493c8 100644 --- a/toolchain/kernel-headers/kernel-headers-new.makefile +++ b/toolchain/kernel-headers/kernel-headers-new.makefile @@ -3,11 +3,11 @@ # full kernel tarballs >= 2.6.19.1 # ############################################################# -ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.22.1") +ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.22.6") VERSION:=2 PATCHLEVEL:=6 SUBLEVEL:=22 -EXTRAVERSION:=.1 +EXTRAVERSION:=.6 LOCALVERSION:= LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) LINUX_HEADERS_SITE:=http://www.kernel.org/pub/linux/kernel/v2.6/ @@ -18,11 +18,11 @@ LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux LINUX_HEADERS_IS_KERNEL=y endif -ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.21.5") +ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.21.7") VERSION:=2 PATCHLEVEL:=6 SUBLEVEL:=21 -EXTRAVERSION:=.5 +EXTRAVERSION:=.7 LOCALVERSION:= LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) LINUX_HEADERS_SITE:=http://www.kernel.org/pub/linux/kernel/v2.6/ @@ -33,11 +33,11 @@ LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux LINUX_HEADERS_IS_KERNEL=y endif -ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.20.4") +ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.20.19") VERSION:=2 PATCHLEVEL:=6 SUBLEVEL:=20 -EXTRAVERSION:=.4 +EXTRAVERSION:=.19 LOCALVERSION:= LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) LINUX_HEADERS_SITE:=http://www.kernel.org/pub/linux/kernel/v2.6/ diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index b4e0c38ac..b6fe3e56c 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -16,6 +16,7 @@ KERNEL_ARCH:=$(shell $(SHELL) -c "echo \"$(ARCH)\" | sed -e \"s/-.*//\" \ -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ -e s/s390x/s390/ -e s/parisc64/parisc/ \ + -e s/powerpc64/powerpc/ \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ -e s/sh2.*/sh/ -e s/sh3.*/sh/ -e s/sh4.*/sh/") |