diff mbox series

linux: adding CIP RT

Message ID 20191125225846.13484-1-angelo@amarulasolutions.com
State Superseded
Headers show
Series linux: adding CIP RT | expand

Commit Message

Angelo Compagnucci Nov. 25, 2019, 10:58 p.m. UTC 
This patch adds Linux CIP RT, the PREEMPT_RT realtime variant maintained from
the CIP team.

Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
---
 linux/Config.in | 12 ++++++++++++
 linux/linux.mk  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni Nov. 26, 2019, 11:51 a.m. UTC | #1 
Hello,

The .hash file should be updated with the hash of this kernel tarball.

The commit log can be improved, we prefer using imperative sentence
"add <foo>", "fix <bar>" rather than "adding <foo>", "fixing <bar>".

Maybe:

	linux: add option to select the CIP real-time kernel

> -else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION),y)
> +else ifneq ($(filter $(BR2_LINUX_KERNEL_LATEST_CIP_VERSION) $(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION),y),)

Since it's a choice, this is sufficient:

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)),)

Thanks,

Thomas
diff mbox series

Patch

diff --git a/linux/Config.in b/linux/Config.in
index 8c5539c9ab..eacd53dafb 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -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
@@ -124,6 +135,7 @@  config BR2_LINUX_KERNEL_VERSION
 	string
 	default "5.3.8" if BR2_LINUX_KERNEL_LATEST_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 c45db4d24f..befad98f2f 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -29,7 +29,7 @@  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)
+else ifneq ($(filter $(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)),)