Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 10/16] linux-headers: rework hash exclusion
Date: Tue, 21 Mar 2017 01:07:06 +0100	[thread overview]
Message-ID: <20170321000712.26500-11-arnout@mind.be> (raw)
In-Reply-To: <20170321000712.26500-1-arnout@mind.be>

Although we currently don't have a .hash file for linux-headers, there
already are exclusions for the BR2_KERNEL_HEADERS_AS_KERNEL case (copied
from linux.mk).  However, there is no exclusion for the
BR2_KERNEL_HEADERS_VERSION case.

For the BR2_KERNEL_HEADERS_AS_KERNEL case, the exclusion is actually
not needed. Indeed, KERNEL_HEADERS_SOURCE is computed to be the same
value as LINUX_SOURCE, and linux.mk already adds LINUX_SOURCE to
BR_NO_CHECK_HASH_FOR.

For the other cases, we should exclude the BR2_KERNEL_HEADERS_VERSION
case because there the user supplies the version so it can't be
included in the .hash file.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/linux-headers/linux-headers.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk
index 8f339cfec5..d83b9b0b02 100644
--- a/package/linux-headers/linux-headers.mk
+++ b/package/linux-headers/linux-headers.mk
@@ -16,7 +16,6 @@ ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y)
 LINUX_HEADERS_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
 LINUX_HEADERS_SITE = $(patsubst %/,%,$(dir $(LINUX_HEADERS_TARBALL)))
 LINUX_HEADERS_SOURCE = $(notdir $(LINUX_HEADERS_TARBALL))
-BR_NO_CHECK_HASH_FOR += $(LINUX_HEADERS_SOURCE)
 else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y)
 LINUX_HEADERS_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
 LINUX_HEADERS_SITE_METHOD = git
@@ -29,9 +28,6 @@ LINUX_HEADERS_SITE_METHOD = hg
 LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
 else
 LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
-ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y)
-BR_NO_CHECK_HASH_FOR += $(LINUX_HEADERS_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.
@@ -80,6 +76,10 @@ LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
 endif
 LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
 
+ifeq ($(BR2_KERNEL_HEADERS_VERSION),y)
+BR_NO_CHECK_HASH_FOR += $(LINUX_HEADERS_SOURCE)
+endif
+
 endif # ! BR2_KERNEL_HEADERS_AS_KERNEL
 
 LINUX_HEADERS_LICENSE = GPLv2
-- 
2.11.0

  parent reply	other threads:[~2017-03-21  0:07 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-21  0:06 [Buildroot] [PATCH 00/16] Enable hash checking for git downloads Arnout Vandecappelle
2017-03-21  0:06 ` [Buildroot] [PATCH 01/16] download/git: create GNU format tar files Arnout Vandecappelle
2017-03-21 22:16   ` Thomas Petazzoni
2017-03-31  6:44   ` Peter Korsgaard
2017-03-21  0:06 ` [Buildroot] [PATCH 02/16] aer-inject: remove redundant _SITE_METHOD Arnout Vandecappelle
2017-03-21  0:06 ` [Buildroot] [PATCH 03/16] fmc: correct hash file Arnout Vandecappelle
2017-03-21 15:17   ` Matthew Weber
2017-03-31  6:45   ` Peter Korsgaard
2017-03-21  0:07 ` [Buildroot] [PATCH 04/16] linux-firmware: correct hash Arnout Vandecappelle
2017-03-31  6:52   ` Peter Korsgaard
2017-03-21  0:07 ` [Buildroot] [PATCH 05/16] squashfs: " Arnout Vandecappelle
2017-03-31  6:53   ` Peter Korsgaard
2017-03-21  0:07 ` [Buildroot] [PATCH 06/16] ubus: add hash Arnout Vandecappelle
2017-03-21  9:47   ` Thomas Petazzoni
2017-03-21  9:54     ` Arnout Vandecappelle
2017-03-21  0:07 ` [Buildroot] [PATCH 07/16] uhttpd: " Arnout Vandecappelle
2017-03-21  0:07 ` [Buildroot] [PATCH 08/16] vboot-utils: " Arnout Vandecappelle
2017-03-21  0:07 ` [Buildroot] [PATCH 09/16] linux: exclude from hash check except for latest version Arnout Vandecappelle
2017-03-21  0:07 ` Arnout Vandecappelle [this message]
2017-03-21  0:07 ` [Buildroot] [PATCH 11/16] uboot: " Arnout Vandecappelle
2017-03-21  0:07 ` [Buildroot] [PATCH 12/16] barebox: " Arnout Vandecappelle
2017-03-21  0:07 ` [Buildroot] [PATCH 13/16] at91bootstrap3: exclude from hash when downloading from git Arnout Vandecappelle
2017-03-21  0:07 ` [Buildroot] [PATCH 14/16] mxs-bootlets: " Arnout Vandecappelle
2017-03-21  0:07 ` [Buildroot] [PATCH 15/16] arm-trusted-firmware: " Arnout Vandecappelle
2017-03-21  0:07 ` [Buildroot] [PATCH 16/16] pkg-download: enable hash check for git downloads Arnout Vandecappelle
2017-03-21 12:19 ` [Buildroot] [PATCH 00/16] Enable hash checking " Ricardo Martincoski
2017-03-21 21:39   ` Arnout Vandecappelle
2017-03-21 22:18 ` Thomas Petazzoni
2017-06-11 12:37 ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170321000712.26500-11-arnout@mind.be \
    --to=arnout@mind.be \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox