diff mbox

[v3] linux: Fix URL for release candidate versions

Message ID 20170811035035.5750-1-luaraneda@gmail.com
State Accepted
Headers show

Commit Message

Luis Araneda Aug. 11, 2017, 3:50 a.m. UTC 
Starting with 4.12-rc1, tarballs are generated by cgit
directly from Linus's tree.
Also, set LINUX_SOURCE only on non-rc kernels,
and use <PKG>_SOURCE otherwise.

This method also applies to older release candidates.

Signed-off-by: Luis Araneda <luaraneda@gmail.com>

---
Changes v2 -> v3:
  - Moved the LINUX_SITE variable assignment to
    a better place.
  - Tested more cases to ensure it won't break things

Changes v1 -> v2:
  - Set LINUX_SOURCE only on non-rc kernels (suggested by Arnout)
---
 linux/linux.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Arnout Vandecappelle Aug. 11, 2017, 12:10 p.m. UTC | #1 
On 11-08-17 05:50, Luis Araneda wrote:
> Starting with 4.12-rc1, tarballs are generated by cgit
> directly from Linus's tree.
> Also, set LINUX_SOURCE only on non-rc kernels,
> and use <PKG>_SOURCE otherwise.
> 
> This method also applies to older release candidates.
> 
> Signed-off-by: Luis Araneda <luaraneda@gmail.com>

 I added a comment to the .mk file that explains all of the above and applied to
master, thanks.

 Regards,
 Arnout
diff mbox

Patch

diff --git a/linux/linux.mk b/linux/linux.mk
index 032d64fc2..799bd5839 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -31,6 +31,8 @@  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/bwh/linux-cip.git
+else ifneq ($(findstring -rc,$(LINUX_VERSION)),)
+LINUX_SITE = https://git.kernel.org/torvalds/t
 else
 LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz
 # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
@@ -43,10 +45,6 @@  LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x
 else ifeq ($(findstring x4.,x$(LINUX_VERSION)),x4.)
 LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
 endif
-# release candidates are in testing/ subdir
-ifneq ($(findstring -rc,$(LINUX_VERSION)),)
-LINUX_SITE := $(LINUX_SITE)/testing
-endif # -rc
 endif
 
 ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y)