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

- bump non-sanitized version to 2.6.19 

- remove some superfluous mkdir's
- allow for patch, patch.gz, patch.bz2 per version
parent a7c4777b

toolchain/kernel-headers/Config.in

+3 −3
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ choice 
		depends !BR2_nios2

		bool "Linux 2.6.12 kernel headers"



	config BR2_KERNEL_HEADERS_2_6_18

	config BR2_KERNEL_HEADERS_2_6_19

		depends !BR2_nios2

		bool "Linux 2.6.18 kernel headers"

		bool "Linux 2.6.19 kernel headers"



endchoice
@@ -53,4 +53,4 @@ 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.18"    if BR2_KERNEL_HEADERS_2_6_18
 
	default "2.6.19"    if BR2_KERNEL_HEADERS_2_6_19

toolchain/kernel-headers/kernel-headers.mk

+8 −9
Original line number Diff line number Diff line
@@ -93,18 +93,20 @@ LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.12.0 
endif

LINUX_HEADERS_IS_KERNEL=n



ifeq ("$(strip $(DEFAULT_KERNEL_HEADERS))","2.6.18")

ifeq ("$(strip $(DEFAULT_KERNEL_HEADERS))","2.6.19")

VERSION:=2

PATCHLEVEL:=6

SUBLEVEL:=18

SUBLEVEL:=19

EXTRAVERSION:=

LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

LINUX_HEADERS_SITE:=http://www.kernel.org/pub/linux/kernel/v2.6/

LINUX_HEADERS_SOURCE:=linux-2.6.18.3.tar.bz2

LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.bz2

LINUX_HEADERS_CAT:=$(BZCAT)

LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-2.6.18.3

LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-$(LINUX_HEADERS_VERSION)

LINUX_HEADERS_IS_KERNEL=y

endif



LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)

LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)



LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
@@ -117,20 +119,17 @@ LINUX_HEADERS_DO_MOVE=n 
endif



$(DL_DIR)/$(LINUX_HEADERS_SOURCE):

	mkdir -p $(DL_DIR)

	$(WGET) -P $(DL_DIR) $(LINUX_HEADERS_SITE)/$(LINUX_HEADERS_SOURCE)



ifeq ($(LINUX_HEADERS_DO_MOVE),y)

$(LINUX_HEADERS_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)

	rm -rf $(LINUX_HEADERS_DIR)

	mkdir -p $(TOOL_BUILD_DIR)

	$(LINUX_HEADERS_CAT) $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -

	mv $(LINUX_HEADERS_UNPACK_DIR) $(LINUX_HEADERS_DIR)

	touch $(LINUX_HEADERS_DIR)/.unpacked

else

$(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)

	rm -rf $(LINUX_HEADERS_DIR)

	mkdir -p $(TOOL_BUILD_DIR)

	$(LINUX_HEADERS_CAT) $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -

	touch $(LINUX_HEADERS_UNPACK_DIR)/.unpacked

endif
@@ -145,7 +144,7 @@ KERNEL_ARCH:=$(shell $(SHELL) -c "echo \"$(ARCH)\" | sed -e \"s/-.*//\" \ 
	-e s/ppc.*/powerpc/ -e s/mips.*/mips/")



$(LINUX_HEADERS_UNPACK_DIR)/.patched: $(LINUX_HEADERS_UNPACK_DIR)/.unpacked

	toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers linux-$(LINUX_HEADERS_VERSION)\*.patch

	toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}

	touch $(LINUX_HEADERS_UNPACK_DIR)/.patched



$(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_UNPACK_DIR)/.patched