| Message ID | 1491497905-18810-1-git-send-email-angelo.compagnucci@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
Hello, On Thu, 6 Apr 2017 18:58:25 +0200, Angelo Compagnucci wrote: > This patch adds an easy way to select the CIP project SLTS > kernel within the kernel menu. > > Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> I've applied after doing a few tweaks, see below. > +config BR2_CIP_KERNEL_REPO_URL > + string "CIP SLTS (SuperLong Term Support) kernel url" > + default "git://git.kernel.org/pub/scm/linux/kernel/git/bwh/linux-cip.git" I've completely dropped this option. Indeed, it is already possible without your patch to select a custom Git repository to download the kernel. So having yet another option to do that is useless. If you want to use a custom CIP repository, just use the existing BR2_LINUX_KERNEL_CUSTOM_GIT option. > + help > + CIP launched in the spring of 2016 to address the needs of > + organizations in industries such as power generation and > + distribution, water, oil and gas, transportation, building > + automation and more for reliable and secure Linux-based > + embedded systems that can be sustained over a period of > + 10 to as many as 60 years. > + The project's goal is to provide an open source base layer > + of industrial-grade software that permits the use and > + implementation of software building blocks that meet > + these requirements. > + > + The CIP community plans to maintain 4.4 for security and > + bug fixes for more than 10 years. Since this help text was useful, I've moved it under the BR2_LINUX_KERNEL_LATEST_CIP_VERSION option. > +config BR2_LINUX_KERNEL_LATEST_CIP_VERSION > + bool "Latest CIP SLTS (Super Long Term Support) version (v4.4.55-cip3)" This prompt was too long and didn't fit in the menuconfig window. So I've removed the "(Super Long Term Support)" part of it, which is anyway explained in the help text. Applied with those two changes. Thanks! Thomas
Dear Thomas Petazzoni, 2017-04-06 22:29 GMT+02:00 Thomas Petazzoni < thomas.petazzoni@free-electrons.com>: > Hello, > > On Thu, 6 Apr 2017 18:58:25 +0200, Angelo Compagnucci wrote: > > This patch adds an easy way to select the CIP project SLTS > > kernel within the kernel menu. > > > > Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> > > I've applied after doing a few tweaks, see below. > > > +config BR2_CIP_KERNEL_REPO_URL > > + string "CIP SLTS (SuperLong Term Support) kernel url" > > + default "git://git.kernel.org/pub/scm/linux/kernel/git/bwh/linux- > cip.git" > > I've completely dropped this option. Indeed, it is already possible > without your patch to select a custom Git repository to download the > kernel. So having yet another option to do that is useless. If you want > to use a custom CIP repository, just use the existing > BR2_LINUX_KERNEL_CUSTOM_GIT option. > > > > > + help > > + CIP launched in the spring of 2016 to address the needs of > > + organizations in industries such as power generation and > > + distribution, water, oil and gas, transportation, building > > + automation and more for reliable and secure Linux-based > > + embedded systems that can be sustained over a period of > > + 10 to as many as 60 years. > > + The project's goal is to provide an open source base layer > > + of industrial-grade software that permits the use and > > + implementation of software building blocks that meet > > + these requirements. > > + > > + The CIP community plans to maintain 4.4 for security and > > + bug fixes for more than 10 years. > > Since this help text was useful, I've moved it under the > BR2_LINUX_KERNEL_LATEST_CIP_VERSION option. > > > +config BR2_LINUX_KERNEL_LATEST_CIP_VERSION > > + bool "Latest CIP SLTS (Super Long Term Support) version > (v4.4.55-cip3)" > > This prompt was too long and didn't fit in the menuconfig window. So > I've removed the "(Super Long Term Support)" part of it, which is > anyway explained in the help text. > > Applied with those two changes. Thanks! > I'm super happy! Thank you so much, really appreciated! > > Thomas > -- > Thomas Petazzoni, CTO, Free Electrons > Embedded Linux and Kernel engineering > http://free-electrons.com >
diff --git a/Config.in b/Config.in index bd8f0d1..b089ed8 100644 --- a/Config.in +++ b/Config.in @@ -261,6 +261,26 @@ config BR2_KERNEL_MIRROR http://www.XX.kernel.org/pub (XX = country code) http://mirror.aarnet.edu.au/pub/ftp.kernel.org +config BR2_CIP_KERNEL_REPO_URL + string "CIP SLTS (SuperLong Term Support) kernel url" + default "git://git.kernel.org/pub/scm/linux/kernel/git/bwh/linux-cip.git" + help + CIP launched in the spring of 2016 to address the needs of + organizations in industries such as power generation and + distribution, water, oil and gas, transportation, building + automation and more for reliable and secure Linux-based + embedded systems that can be sustained over a period of + 10 to as many as 60 years. + The project's goal is to provide an open source base layer + of industrial-grade software that permits the use and + implementation of software building blocks that meet + these requirements. + + The CIP community plans to maintain 4.4 for security and + bug fixes for more than 10 years. + + https://www.cip-project.org + config BR2_GNU_MIRROR string "GNU Software mirror" default "http://ftpmirror.gnu.org" diff --git a/linux/Config.in b/linux/Config.in index c5565e5..f12d511 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,6 +28,9 @@ choice config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (4.10.8)" +config BR2_LINUX_KERNEL_LATEST_CIP_VERSION + bool "Latest CIP SLTS (Super Long Term Support) version (v4.4.55-cip3)" + config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" help @@ -98,6 +101,7 @@ endif config BR2_LINUX_KERNEL_VERSION string default "4.10.8" if BR2_LINUX_KERNEL_LATEST_VERSION + default "v4.4.55-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_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 f68a3ff..3fa6c15 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -30,6 +30,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 = $(call qstrip,$(BR2_CIP_KERNEL_REPO_URL)) +LINUX_SITE_METHOD = git else LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y)
This patch adds an easy way to select the CIP project SLTS kernel within the kernel menu. Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> --- Config.in | 20 ++++++++++++++++++++ linux/Config.in | 4 ++++ linux/linux.mk | 3 +++ 3 files changed, 27 insertions(+)