jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-31 23:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel-headers: make snapshot option more user friendly

Browse Source 
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>
This commit is contained in:
Peter Korsgaard 2009-12-06 15:40:03 +01:00
parent 1ba3c8434c
commit 79c9a433ed
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -4,6 +4,7 @@
Issues resolved (http://bugs.uclibc.org): Issues resolved (http://bugs.uclibc.org):
#751: Kernel 2.6 snapshot fetch fail
#753: Bump lighttpd package to 1.4.25 #753: Bump lighttpd package to 1.4.25
#761: Add binutils 2.20 to toolchain options #761: Add binutils 2.20 to toolchain options

2
toolchain/kernel-headers/Config.in
View File

@ -47,7 +47,7 @@ choice
bool "Linux 2.6 (manually specified version)" bool "Linux 2.6 (manually specified version)"
config BR2_KERNEL_HEADERS_SNAP config BR2_KERNEL_HEADERS_SNAP
bool "Linux 2.6 snapshot" bool "Local Linux snapshot (linux-2.6.tar.bz2)"
endchoice endchoice
config BR2_KERNEL_HEADERS_RT config BR2_KERNEL_HEADERS_RT

3
toolchain/kernel-headers/kernel-headers-new.makefile
View File

@ -13,9 +13,10 @@ EXTRAVERSION:=$(word 4, $(LNXVER))
LOCALVERSION:= LOCALVERSION:=
# should contain prepended dot # should contain prepended dot
SUBLEVEL:=$(if $(SUBLEVEL),.$(SUBLEVEL),)
EXTRAVERSION:=$(if $(EXTRAVERSION),.$(EXTRAVERSION),) 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_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.bz2 LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.bz2
LINUX_HEADERS_CAT:=$(BZCAT) LINUX_HEADERS_CAT:=$(BZCAT)

3
toolchain/kernel-headers/kernel-headers.mk
View File

@ -24,6 +24,9 @@ KERNEL_ARCH:=$(shell $(SHELL) -c "echo \"$(ARCH)\" | sed -e \"s/-.*//\" \
include toolchain/kernel-headers/kernel-headers-new.makefile include toolchain/kernel-headers/kernel-headers-new.makefile
$(DL_DIR)/$(LINUX_HEADERS_SOURCE): $(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)) $(call DOWNLOAD,$(LINUX_HEADERS_SITE),$(LINUX_HEADERS_SOURCE))
kernel-headers: $(LINUX_HEADERS_DIR)/.configured kernel-headers: $(LINUX_HEADERS_DIR)/.configured