diff options
authorGravatar Ricardo Martincoski <ricardo.martincoski@gmail.com>2018-06-28 22:42:46 -0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-07-14 23:25:03 +0200
commitb115ecd122d6a9738d89b5e6efc5f7f6df7872e9 (patch)
parentf99659d314d535f35e21f2d1003b8c813a7adfc0 (diff)
pkg-generic: fix no-check-hash for inferred site method
Currently, when the site method is explicitly set to a SCM other than git, the main download is correctly excluded from being hash-checked. But when the site method is inferred from the site uri, the download from a SCM other than git is wrongly being hash-checked. Fix this by moving the code that excludes SCM methods from hash-check below the code that infers the site method. Currently there is no package in the tree that uses inferred site method, and that is why the autobuilder didn't caught this. We had packages using inferred site method in the past, the last one was 'expect', but since they didn't have a hash file (for a license or extra-download for example) the build didn't error out. Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Cc: Luca Ceresoli <luca@lucaceresoli.net> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Yann E. MORIN <yann.morin.1998@free.fr> Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> Tested-by: Luca Ceresoli <luca@lucaceresoli.net> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
1 files changed, 4 insertions, 4 deletions
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 501dd3de39..91b61c6de0 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -489,10 +489,6 @@ ifndef $(2)_PATCH
-ifneq ($$(filter bzr cvs hg svn,$$($(2)_SITE_METHOD)),)
$$(if $$($(2)_SOURCE),$$($(2)_SITE_METHOD)+$$($(2)_SITE)/$$($(2)_SOURCE)) \
$$(foreach p,$$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS),\
@@ -514,6 +510,10 @@ ifndef $(2)_SITE_METHOD
+ifneq ($$(filter bzr cvs hg svn,$$($(2)_SITE_METHOD)),)
# Do not accept to download git submodule if not using the git method
ifneq ($$($(2)_GIT_SUBMODULES),)
ifneq ($$($(2)_SITE_METHOD),git)