diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-12-06 15:40:03 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-12-06 15:54:03 +0100 |
| commit | 79c9a433ed0baaf568aa8b27c692001798905742 (patch) | |
| tree | 3d1aef65c990ef503a34310bd3c07f4ae3e59e89 /toolchain/kernel-headers | |
| parent | 1ba3c8434cc150f166862dbb368f8ca35332b39a (diff) | |
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: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'toolchain/kernel-headers')
| -rw-r--r-- | toolchain/kernel-headers/Config.in | 2 | ||||
| -rw-r--r-- | toolchain/kernel-headers/kernel-headers-new.makefile | 3 | ||||
| -rw-r--r-- | toolchain/kernel-headers/kernel-headers.mk | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 267740914..df0f9c803 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -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 diff --git a/toolchain/kernel-headers/kernel-headers-new.makefile b/toolchain/kernel-headers/kernel-headers-new.makefile index 29deaae76..d0a3f2a64 100644 --- a/toolchain/kernel-headers/kernel-headers-new.makefile +++ b/toolchain/kernel-headers/kernel-headers-new.makefile @@ -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) diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 1f637f966..8046ef474 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -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 |