From: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 12/16] barebox: exclude from hash check except for latest version
Date: Tue, 21 Mar 2017 01:07:08 +0100 [thread overview]
Message-ID: <20170321000712.26500-13-arnout@mind.be> (raw)
In-Reply-To: <20170321000712.26500-1-arnout@mind.be>
Instead of excluding the hash specifically for the custom tarball and
custom version cases, exclude it always except in the one case where
we do have a hash: 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 is not needed to exclude it twice for barebox and barebox-aux,
because they use the same source tarball and barebox-aux can only be
enabled if barebox is enabled. So simplify even further by pulling
the exclusion logic out of inner-barebox-package.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
boot/barebox/barebox.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 7a110d2145..dc19224c76 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -22,7 +22,6 @@ ifeq ($$($(1)_VERSION),custom)
$(1)_TARBALL = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION))
$(1)_SITE = $$(patsubst %/,%,$$(dir $$($(1)_TARBALL)))
$(1)_SOURCE = $$(notdir $$($(1)_TARBALL))
-BR_NO_CHECK_HASH_FOR += $$($(1)_SOURCE)
else ifeq ($$(BR2_TARGET_BAREBOX_CUSTOM_GIT),y)
$(1)_SITE = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL))
$(1)_SITE_METHOD = git
@@ -30,9 +29,6 @@ else
# Handle stable official Barebox versions
$(1)_SOURCE = barebox-$$($(1)_VERSION).tar.bz2
$(1)_SITE = http://www.barebox.org/download
-ifeq ($$(BR2_TARGET_BAREBOX_CUSTOM_VERSION),y)
-BR_NO_CHECK_HASH_FOR += $$($(1)_SOURCE)
-endif
endif
$(1)_DEPENDENCIES = host-lzop
@@ -155,3 +151,7 @@ barebox-package=$(call inner-barebox-package,$(call UPPERCASE,$(pkgname)))
include boot/barebox/barebox/barebox.mk
include boot/barebox/barebox-aux/barebox-aux.mk
+
+ifeq ($(BR2_TARGET_BAREBOX)$(BR2_TARGET_BAREBOX_LATEST_VERSION),y)
+BR_NO_CHECK_HASH_FOR += $(BAREBOX_SOURCE)
+endif
--
2.11.0
next prev 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 ` [Buildroot] [PATCH 10/16] linux-headers: rework hash exclusion Arnout Vandecappelle
2017-03-21 0:07 ` [Buildroot] [PATCH 11/16] uboot: 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 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-13-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