mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-12-13 20:36:21 +01:00
Merge bitcoin/bitcoin#33580: depends: Use $(package)_file_name when downloading from the fallback
671b774d1bdepends: Use $(package)_file_name when downloading from the fallback (Ava Chow) Pull request description: The server hosting the fallbacks uses `make download` so the files are only available with their overridden names rather than the original name on the upstream source. We should therefore also use the overridden name when downloading from the fallback. Fixes https://github.com/bitcoin-core/bitcoincore.org/issues/1168 ACKs for top commit: theuni: utACK671b774d1b. I was going to PR the same change. janb84: ut ACK671b774d1bhebasto: ACK671b774d1b, tested with the following patch: Tree-SHA512: ba010adb64900d8d748487cc1a658e2b163872354f4e7b38c4dfc37a14fcb22fec4379a635d2c6788c64dd46bef0d94aa3eb6f522ec700680e886d5468678031
This commit is contained in:
@@ -37,7 +37,7 @@ endef
|
||||
|
||||
define fetch_file
|
||||
( $(call fetch_file_inner,$(1),$(2),$(3),$(4),$(5)) || \
|
||||
$(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5)))
|
||||
$(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(4),$(4),$(5)))
|
||||
endef
|
||||
|
||||
# Shell script to create a source tarball in $(1)_source from local directory
|
||||
|
||||
Reference in New Issue
Block a user