From d95a6dac3143a74fbd011eb423f3010ae3b05927 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 11 May 2022 08:23:16 +0200 Subject: [PATCH] package/pkg-generic: explicitly do not download package withtout source Recent commit f0c7cb01a960 (package/pkg-download: do not try to vendor _EXTRA_DOWNLOADS) got last-minute changes when applied, which changed the expected behaviour for packages that do not have a main download. Before f0c7cb01a960, the dl-wrapper would not even be called for those packages, and the original patch that was sent also avoided downloading such packages, but f0c7cb01a960 now causes the dl-wrapper to be called. It is however an accident that the dl-wrapper does not fail. Indeed, it is expected to fail if no download was successful; we pass no URI, so the dl-wrapper should have failed, as it basically does: download_and_check=0 for uri in "${uris[@]}"; do ... done if [ "${download_and_check}" -eq 0 ]; then exit 1 fi However, it does not even go that far... Even though there is no output file, we still pass the path to the package output directory as the output path. So, to avoid downloading files already present, the wrapper checks if the output file exists, and checks its hash: if [ -e "${output}" ]; then if support/download/check-hash ${quiet} "${hfile}" "${output}" ... exit 0 ... fi The output path does exist now, because we explicitly create it just before calling the wrapper, because that's where we also locate the lockfile. So it ends up trying to validate the hash of a directory, but it fails to, as there is indeed no hash file for that package. And a missing hash file is just a warning, not an error, which makes the download actually a success... So, this is currently working, and this is by pure luck. However, there is a potential issue: if a target package is a virtual package, but the host package is a real package, e.g. the same foo.mk does (or the other way around): HOST_FOO_VERSION = 1.2.3 HOST_FOO_SITE = http://example.net/ $(eval $(virtual-package)) $(eval $(host-generic-package)) If there is a hash file to validate the host download, then the current situation will cause a failure, because there would be a hash file, but no hash for the output path of the target variant, which would then be a hard-error. So, revert to the behaviour from before f0c7cb01a960, where no download is attempted for a package without a source (really, without a main download, now). Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 38219ce088..b233b07548 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -192,7 +192,7 @@ $(BUILD_DIR)/%/.stamp_downloaded: break ; \ fi ; \ done - $(call DOWNLOAD,$($(PKG)_MAIN_DOWNLOAD),$(PKG),$(patsubst %,-p '%',$($(PKG)_DOWNLOAD_POST_PROCESS))) + $(if $($(PKG)_MAIN_DOWNLOAD),$(call DOWNLOAD,$($(PKG)_MAIN_DOWNLOAD),$(PKG),$(patsubst %,-p '%',$($(PKG)_DOWNLOAD_POST_PROCESS)))) $(foreach p,$($(PKG)_ADDITIONAL_DOWNLOADS),$(call DOWNLOAD,$(p),$(PKG))$(sep)) $(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) $(Q)mkdir -p $(@D)