From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Petazzoni Date: Tue, 1 Aug 2017 23:44:59 +0200 Subject: [Buildroot] [PATCH v2] linux: Fix URL for release candidate versions In-Reply-To: <20170726021352.31148-1-luaraneda@gmail.com> References: <20170726021352.31148-1-luaraneda@gmail.com> Message-ID: <20170801234459.50ccc92a@windsurf.home> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hello, On Tue, 25 Jul 2017 22:13:52 -0400, 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 _SOURCE otherwise. > > This method also applies to older release candidates. > > Signed-off-by: Luis Araneda > > --- > Changes v1 -> v2: > - Set LINUX_SOURCE only on non-rc kernels (suggested by Arnout) > > linux/linux.mk | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/linux/linux.mk b/linux/linux.mk > index 032d64fc2..f02734102 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -16,7 +16,9 @@ define LINUX_HELP_CMDS > endef > > # Compute LINUX_SOURCE and LINUX_SITE from the configuration > -ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) > +ifneq ($(findstring -rc,$(LINUX_VERSION)),) I think this condition should go *inside* the ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) condition. Indeed with your current situation, if by any chance I have a Git tag such as this-is-a-rc-kernel, then it will match your condition, and ignore the Git repository address. So I really think we want to test the -rc case inside the ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) condition, such as: ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) ifneq ($(findstring -rc,$(LINUX_VERSION)),) LINUX_SITE = https://git.kernel.org/torvalds/t else ... endif endif # tarball Also, please use "=" to assign variables, not ":=". Best regards, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com