From ba0a5b11d9c9f3b4ed579e34327928dbdb0bcaa1 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Tue, 21 Mar 2017 01:07:05 +0100 Subject: [PATCH] linux: exclude from hash check except for latest version We don't have a hash for any linux version. We currently also don't have a hash for the latest version, but if we ever add a hash, it will only be for the latest version. This simplifies the code a little because soon we will add hash checks for git as well, so we also need an exclusion in that case. It's much easier to always exclude except in the single case where we do have a hash. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index 9da7e9bec1..d06f74f9f7 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -20,7 +20,6 @@ ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) LINUX_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION)) LINUX_SITE = $(patsubst %/,%,$(dir $(LINUX_TARBALL))) LINUX_SOURCE = $(notdir $(LINUX_TARBALL)) -BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = git @@ -34,9 +33,6 @@ 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 LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz -ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y) -BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) -endif # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order # to use the $(word) function. We support versions such as 4.0, 3.1, # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc. @@ -53,6 +49,10 @@ LINUX_SITE := $(LINUX_SITE)/testing endif # -rc endif +ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) +endif + LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH)) # We rely on the generic package infrastructure to download and apply -- 2.30.2