From da74078b341514096b306cba20386c9519c7ec30 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 14 Oct 2018 14:25:40 +0200 Subject: core: add a variable that points to the package's hash file When a package has a version selection (e.g. Qt5), the licensing terms may be different across versions, but lie in similarly named files (e.g. 'LICENSE'). However, when we check a file, all the hashes for it must match. So, we can't have the hashes for two different content of the same file. We overcame that limitation in the legal-license-file macro, which checks whether a package has a .hash file in a versioned subdir. For consistency, we would like to also store the source hashes in that per-version subdir. Rather than reconstruct the path to the hash file everywhere we need it, add a variable that points to it. Existing users will be converted over in followup patches. Note: the check for a missing hash file is done in the check-hash helper script, so this variable must always yield a filename, even of a missing file, thus we do not use $(wildcard...) to resolve the hash file path; we use $(wildcard...) only to check if the versioned .hash file exists. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Luca Ceresoli Cc: Baruch Siach Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'package') diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index daf24594de..7dfad2d1be 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -434,6 +434,12 @@ else endif $(2)_VERSION := $$(call sanitize,$$($(2)_DL_VERSION)) +$(2)_HASH_FILE = \ + $$(strip \ + $$(if $$(wildcard $$($(2)_PKGDIR)/$$($(2)_VERSION)/$$($(2)_RAWNAME).hash),\ + $$($(2)_PKGDIR)/$$($(2)_VERSION)/$$($(2)_RAWNAME).hash,\ + $$($(2)_PKGDIR)/$$($(2)_RAWNAME).hash)) + ifdef $(3)_OVERRIDE_SRCDIR $(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR) endif -- cgit v1.2.1