Commit 79c9a433 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

kernel-headers: make snapshot option more user friendly 



Closes #751.

Make kernel headers snapshot more user friendly by making it more obvious
that it's about using a local kernel snapshot, and error out with a sensible
error message if the option is enabled but no linux-2.6.tar.bz2 is present
in DL_DIR, rather than trying to fetch it from kernel.org.

Furthermore fix the bug where it tried to use linux-2.6..tar.bz2 instead of
linux-2.6.tar.bz2.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 1ba3c843

CHANGES

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


	Issues resolved (http://bugs.uclibc.org):



	#751: Kernel 2.6 snapshot fetch fail

	#753: Bump lighttpd package to 1.4.25

	#761: Add binutils 2.20 to toolchain options

toolchain/kernel-headers/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ choice 
		bool "Linux 2.6 (manually specified version)"



	config BR2_KERNEL_HEADERS_SNAP

		bool "Linux 2.6 snapshot"

		bool "Local Linux snapshot (linux-2.6.tar.bz2)"

endchoice



config BR2_KERNEL_HEADERS_RT

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

+2 −1
Original line number Diff line number Diff line
@@ -13,9 +13,10 @@ EXTRAVERSION:=$(word 4, $(LNXVER)) 
LOCALVERSION:=



# should contain prepended dot

SUBLEVEL:=$(if $(SUBLEVEL),.$(SUBLEVEL),)

EXTRAVERSION:=$(if $(EXTRAVERSION),.$(EXTRAVERSION),)



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

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

LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/

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

LINUX_HEADERS_CAT:=$(BZCAT)

toolchain/kernel-headers/kernel-headers.mk

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ KERNEL_ARCH:=$(shell $(SHELL) -c "echo \"$(ARCH)\" | sed -e \"s/-.*//\" \ 
include toolchain/kernel-headers/kernel-headers-new.makefile



$(DL_DIR)/$(LINUX_HEADERS_SOURCE):

ifeq ($(BR2_KERNEL_HEADERS_SNAP),y)

	$(error No local $@ found, cannot continue. Are you sure you wanted to enable BR2_KERNEL_HEADERS_SNAP?)

endif

	$(call DOWNLOAD,$(LINUX_HEADERS_SITE),$(LINUX_HEADERS_SOURCE))



kernel-headers: $(LINUX_HEADERS_DIR)/.configured