summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2018-10-14 14:25:43 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-10-20 20:04:06 +0200
commit155f752d8a1d82611e8b180f3510996152efdcc7 (patch)
tree63d525ec3bbfca34bb1b095f2215b07b2bafe18f
parent3fe92792b3cc4c6eec74ae6bcf6b274668d2534e (diff)
downloadbuildroot-155f752d8a1d82611e8b180f3510996152efdcc7.tar.gz
buildroot-155f752d8a1d82611e8b180f3510996152efdcc7.zip
core/download: do not hard-code the path to the package hash file
Now that packges may have hashes for their downloaded files in a versioned subdir or in the unversioned hash file, we can no longer hard-code the path to the package hash file anymore. Instead, we now make use of the per-package variable, that points to the package hash file. Note: of the packages for which we offer a version choice, almost none, but some of the qt5 ones, have a per-version hash file, so we still use the unversioned hash file for them. As for the few qt5 packages that do have a per-version hash file for their licensing terms, they've already been updated to duplicate their download hashes in both the unversioned and per-version hash files. So, one way or the other, no hash check would go missing with this change. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Arnout Vandecappelle <arnout@mind.be> Cc: Luca Ceresoli <luca@lucaceresoli.net> Cc: Baruch Siach <baruch@tkos.co.il> Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/pkg-download.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index bf93b9a08e..73ea2a69f8 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -97,7 +97,7 @@ define DOWNLOAD
-d '$($(PKG)_DL_DIR)' \
-D '$(DL_DIR)' \
-f '$(notdir $(1))' \
- -H '$(PKGDIR)/$($(PKG)_RAWNAME).hash' \
+ -H '$($(PKG)_HASH_FILE)' \
-n '$($(PKG)_BASENAME_RAW)' \
-N '$($(PKG)_RAWNAME)' \
-o '$($(PKG)_DL_DIR)/$(notdir $(1))' \
OpenPOWER on IntegriCloud