Skip to contentSkip to conversation

linux: change download method

PATCH New Angelo Compagnucci 2 participants 3 messages Nov 20, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 linux: change download method

Downloading form https tarball is faster than clonig a git repo. BR2_LINUX_KERNEL_CUSTOM_GIT can be used as a fallback mechanism to downlad the CIP kernel with git.

---
 linux/Config.in | 4 ++--
 linux/linux.mk  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
linux/Config.in +2 -2
index a78a1761c9..923d67fb57 100644
@@ -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.75-cip11)"
 	help
 	  CIP launched in the spring of 2016 to address the needs of
 	  organizations in industries such as power generation and
@@ -123,7 +123,7 @@ endif
 config BR2_LINUX_KERNEL_VERSION
 	string
 	default "5.3.11" if BR2_LINUX_KERNEL_LATEST_VERSION
-	default "v4.19.75-cip11" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
+	default "4.19.75-cip11" 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
linux/linux.mk +2 -1
index 89ac31c2e1..c45db4d24f 100644
@@ -30,7 +30,8 @@ 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
+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.
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 linux: bump to version 4.19.82-cip14

This patch bumps Linux CIP version to 4.19.82-cip14.

---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
linux/Config.in +2 -2
index 923d67fb57..b3915be6c4 100644
@@ -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 (4.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
@@ -123,7 +123,7 @@ endif
 config BR2_LINUX_KERNEL_VERSION
 	string
 	default "5.3.11" if BR2_LINUX_KERNEL_LATEST_VERSION
-	default "4.19.75-cip11" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
+	default "4.19.82-cip14" 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
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/2 linux: change download method

In reply to Angelo Compagnucci

Hello Angelo,

Quoted 9 lines · On Wed, 20 Nov 2019 19:58:53 +0100 Angelo Compagnucci…

Downloading form https tarball is faster than clonig a git repo. BR2_LINUX_KERNEL_CUSTOM_GIT can be used as a fallback mechanism to downlad the CIP kernel with git.

---
 linux/Config.in | 4 ++--
 linux/linux.mk  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

I've applied both patches to next, thanks. However, you had apparently based those patches on master, while they should have been based on next (they are improvements/version bumps). And also, the commit title should have mention that the change is related to the CIP kernel. Indeed "linux: change download method" is a bit vague as it doesn't say that it changes the download method for the CIP kernel. Ditto for the second patch. I tweaked the commit titles when applying.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com