From ff4cccbdcf5417a5a8c251ff302791a306023cc1 Mon Sep 17 00:00:00 2001 From: Luis Araneda Date: Thu, 10 Aug 2017 23:50:35 -0400 Subject: [PATCH] linux: Fix URL for release candidate versions Starting with 4.12-rc1, tarballs are generated by cgit directly from Linus's tree. This also implies that no .tar.xz can be used for them. This method also applies to older release candidates. Signed-off-by: Luis Araneda [Arnout: added comment in the code] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/linux.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index 032d64fc22..c7bf83a66a 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -31,6 +31,10 @@ 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)),) +# Since 4.12-rc1, -rc kernels are generated from cgit. This also works for +# older -rc kernels. +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 +47,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) -- 2.30.2