aboutsummaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2019-12-02 09:39:41 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-12-02 09:39:41 +0100
commit7b24bd59c83346d8181dec0e29530b11851a74a9 (patch)
tree69f22bf20f938ca9e5971fed253a5a6068380bc2 /linux
parent14ec220df34c72b84f3964644cbb5346b2357f89 (diff)
parent01d3360eb682c99f48baa5961a0588a8113d581c (diff)
downloadbuildroot-7b24bd59c83346d8181dec0e29530b11851a74a9.tar.gz
buildroot-7b24bd59c83346d8181dec0e29530b11851a74a9.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'linux')
-rw-r--r--linux/Config.in16
-rw-r--r--linux/linux.mk5
2 files changed, 17 insertions, 4 deletions
diff --git a/linux/Config.in b/linux/Config.in
index f291f671b5..14d737311a 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -35,7 +35,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION
bool "Latest version (5.3)"
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
- bool "Latest CIP SLTS version (v4.19.75-cip11)"
+ bool "Latest CIP SLTS version (4.19.82-cip14)"
help
CIP launched in the spring of 2016 to address the needs of
organizations in industries such as power generation and
@@ -53,6 +53,17 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
https://www.cip-project.org
+config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
+ bool "Latest CIP RT SLTS version (4.19.72-cip10-rt4)"
+ help
+ Same as the CIP version, but this is the PREEMPT_RT realtime
+ variant.
+
+ The CIP community plans to maintain 4.19 for security and
+ bug fixes for more than 10 years.
+
+ https://www.cip-project.org
+
config BR2_LINUX_KERNEL_CUSTOM_VERSION
bool "Custom version"
help
@@ -123,7 +134,8 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
default "5.3.14" if BR2_LINUX_KERNEL_LATEST_VERSION
- default "v4.19.75-cip11" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
+ default "4.19.82-cip14" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
+ default "4.19.72-cip10-rt4" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
if BR2_LINUX_KERNEL_CUSTOM_VERSION
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
diff --git a/linux/linux.mk b/linux/linux.mk
index 89ac31c2e1..762f8868b1 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -29,8 +29,9 @@ LINUX_SITE_METHOD = hg
else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_SVN),y)
LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
LINUX_SITE_METHOD = svn
-else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION),y)
-LINUX_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git
+else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION),y)
+LINUX_SOURCE = linux-cip-$(LINUX_VERSION).tar.gz
+LINUX_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot
else ifneq ($(findstring -rc,$(LINUX_VERSION)),)
# Since 4.12-rc1, -rc kernels are generated from cgit. This also works for
# older -rc kernels.