jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 13:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: bump default kernel to version 3.1

Browse Source 
Bump default kernel vesion to 3.1 to match headers.
Also implement downloads for 3.x series kernels.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Gustavo Zacarias 2011-10-24 11:54:03 -03:00 committed by Peter Korsgaard
parent 19e022a92f
commit 80d7b68167
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linux/Config.in
View File

@ -19,10 +19,10 @@ if BR2_LINUX_KERNEL
# #
choice choice
prompt "Kernel version" prompt "Kernel version"
default BR2_LINUX_KERNEL_2_6_39 default BR2_LINUX_KERNEL_3_1
config BR2_LINUX_KERNEL_2_6_39 config BR2_LINUX_KERNEL_3_1
bool "2.6.39.4" bool "3.1"
config BR2_LINUX_KERNEL_SAME_AS_HEADERS config BR2_LINUX_KERNEL_SAME_AS_HEADERS
bool "Same as toolchain kernel headers" bool "Same as toolchain kernel headers"
@ -58,7 +58,7 @@ endchoice
config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
string "Kernel version" string "Kernel version"
depends on BR2_LINUX_KERNEL_CUSTOM_VERSION depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
default "2.6.39.4" default "3.1"
config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
string "URL of custom kernel tarball" string "URL of custom kernel tarball"
@ -74,7 +74,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
config BR2_LINUX_KERNEL_VERSION config BR2_LINUX_KERNEL_VERSION
string string
default "2.6.39.4" if BR2_LINUX_KERNEL_2_6_39 default "3.1" if BR2_LINUX_KERNEL_3_1
default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

8
linux/linux.mk
View File

@ -18,9 +18,11 @@ LINUX_SOURCE = linux-$(LINUX_VERSION).tar.bz2
# In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
# to use the $(word) function. We support versions such as 3.1, # to use the $(word) function. We support versions such as 3.1,
# 2.6.32, 2.6.32-rc1, 3.0-rc6, etc. # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
LINUX_VERSION_MAJOR = $(word 1,$(subst ., ,$(subst -, ,$(LINUX_VERSION)))) ifeq ($(findstring x2.6.,x$(LINUX_VERSION)),x2.6.)
LINUX_VERSION_MINOR = $(word 2,$(subst ., ,$(subst -, ,$(LINUX_VERSION)))) LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(LINUX_VERSION_MAJOR).$(LINUX_VERSION_MINOR)/ else
LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x/
endif
# release candidates are in testing/ subdir # release candidates are in testing/ subdir
ifneq ($(findstring -rc,$(LINUX_VERSION)),) ifneq ($(findstring -rc,$(LINUX_VERSION)),)
LINUX_SITE := $(LINUX_SITE)testing/ LINUX_SITE := $(LINUX_SITE)testing/