From edc1fd44fa0d78168847b199d44ae107e33861e4 Mon Sep 17 00:00:00 2001 From: Sjors Provoost <sjors@sprovoost.nl> Date: Fri, 31 Jan 2025 08:54:17 +0100 Subject: [PATCH] fixup! package fetch debugging --- depends/Makefile | 3 ++- depends/funcs.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/depends/Makefile b/depends/Makefile index 1053c8a2497536..ddf948199f02ed 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -251,8 +251,9 @@ endef define check_or_remove_sources mkdir -p $($(package)_source_dir); cd $($(package)_source_dir); \ - test -f $($(package)_fetched) && ( $(build_SHA256SUM) -c $($(package)_fetched) >/dev/null 2>/dev/null || \ + test -f $($(package)_fetched) && ( $(build_SHA256SUM) -c $($(package)_fetched) >/dev/null || \ ( echo "Checksum missing or mismatched for $(package) source. Forcing re-download."; \ + set -x; cat $($(package)_fetched); : $($(package)_sha256_hash); ls -ld --full-time $(CURDIR)/$($(package)_local_dir) $($(package)_fetched) $($(package)_source); \ rm -f $($(package)_all_sources) $($(1)_fetched))) || true endef diff --git a/depends/funcs.mk b/depends/funcs.mk index dab925a916c9c8..f9b92788d9b6f9 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -40,7 +40,7 @@ define fetch_file endef define fetch_local_dir_sha256 - if ! [ -f $($(1)_source) ] || [ $($(1)_source) -ot $($(1)_local_dir) ]; then \ + set -x; if ! [ -f $($(1)_source) ] || [ $($(1)_source) -ot $($(1)_local_dir) ]; then \ mkdir -p $(dir $($(1)_source)) && \ $(build_TAR) -c -f $($(1)_source) -C $($(1)_local_dir) . && \ rm -f $($(1)_fetched); \