build, refactor: Drop redundant $(package)_download_file assignments#24288
build, refactor: Drop redundant $(package)_download_file assignments#24288fanquake merged 1 commit intobitcoin:masterfrom
$(package)_download_file assignments#24288Conversation
No need to specify `$(package)_download_file` when it is equal to `$(package)_file_name`.
shaavan
left a comment
There was a problem hiding this comment.
ACK d644c45
According to packages.md:
$(package)_download_file:
The file-name of the upstream source if it differs from how it should be
stored locally. This can be used to avoid storing file-names with strange
characters.
So it makes sense to remove $(package)_download_file where it is identical to $(package)_file_name.
I verified that the changes done in this PR are correct and complete. I also confirmed that $(package)_download_file and $(package)_file_name are different for native_capnp.mk, and hence it cannot be touched under this PR.
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
fanquake
left a comment
There was a problem hiding this comment.
ACK d644c45
Guix build (Darwin):
bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
6b3b0b4b81b5b06d5bca94df20b3d18020f9f09c398e4a4859d2bf2c84a7520b guix-build-d644c45e39c4/output/arm64-apple-darwin/SHA256SUMS.part
56605f3af7443f3d4689ff8bd40ea9dbb95b8272ba599a635c9f3a052e9cac9c guix-build-d644c45e39c4/output/arm64-apple-darwin/bitcoin-d644c45e39c4-arm64-apple-darwin.tar.gz
5dfeddbf16f92b7b36a585f434c9eccbc0a7f3645942874ea15d88f15aced7d6 guix-build-d644c45e39c4/output/arm64-apple-darwin/bitcoin-d644c45e39c4-osx-unsigned.dmg
e1bcd610edf36a84204d96e5f3c2b608824fae0ab064936374555e67addbd47b guix-build-d644c45e39c4/output/arm64-apple-darwin/bitcoin-d644c45e39c4-osx-unsigned.tar.gz
e78c83585c48861152f0fb68548d20721ea75b4e4b683660ca556d8fd5c84527 guix-build-d644c45e39c4/output/dist-archive/bitcoin-d644c45e39c4.tar.gz
ef3808586175dae3283aee9e35486c4cd2bee479999f5353702c5ee2f50c80a5 guix-build-d644c45e39c4/output/x86_64-apple-darwin/SHA256SUMS.part
dd9fd78b4956ff5ed9a66be518db2fc2c1ddc7ebfcd0eb7c7aa039dc96790dfb guix-build-d644c45e39c4/output/x86_64-apple-darwin/bitcoin-d644c45e39c4-osx-unsigned.dmg
389d679abea6eca931a223e31d65474ce9e49cbcb045f5d646527f6c929d1cf9 guix-build-d644c45e39c4/output/x86_64-apple-darwin/bitcoin-d644c45e39c4-osx-unsigned.tar.gz
c565625529613da282a74c1bffccfa0e43512463fa2797e720de5d5aa9d56bc1 guix-build-d644c45e39c4/output/x86_64-apple-darwin/bitcoin-d644c45e39c4-osx64.tar.gz…load_file` assignments d644c45 build, refactor: Drop redundant `$(package)_download_file` assignments (Hennadii Stepanov) Pull request description: No need to specify `$(package)_download_file` when it is equal to `$(package)_file_name`. Historically, before bitcoin#19817, distinct `$(package)_download_file` and `$(package)_file_name` were used for better portability (I guess) by removing `+` characters from a file name. The only package which still use file renaming is `native_capnp`: https://github.com/bitcoin/bitcoin/blob/eca694a4e78d54ce4e29b388b3e81b06e55c2293/depends/packages/native_capnp.mk#L3-L5 ACKs for top commit: shaavan: ACK d644c45 fanquake: ACK d644c45 Tree-SHA512: 488dd0f55cea077174e78a75d8385bacb1a5463883cadeb5fd7c9426865ea5f3a8bad0bd6e8e9d530bce6f0c1715349b3fbabb4e22634348cdd68f5fc8a3c53b
…load_file` assignments d644c45 build, refactor: Drop redundant `$(package)_download_file` assignments (Hennadii Stepanov) Pull request description: No need to specify `$(package)_download_file` when it is equal to `$(package)_file_name`. Historically, before bitcoin#19817, distinct `$(package)_download_file` and `$(package)_file_name` were used for better portability (I guess) by removing `+` characters from a file name. The only package which still use file renaming is `native_capnp`: https://github.com/bitcoin/bitcoin/blob/eca694a4e78d54ce4e29b388b3e81b06e55c2293/depends/packages/native_capnp.mk#L3-L5 ACKs for top commit: shaavan: ACK d644c45 fanquake: ACK d644c45 Tree-SHA512: 488dd0f55cea077174e78a75d8385bacb1a5463883cadeb5fd7c9426865ea5f3a8bad0bd6e8e9d530bce6f0c1715349b3fbabb4e22634348cdd68f5fc8a3c53b
…load_file` assignments d644c45 build, refactor: Drop redundant `$(package)_download_file` assignments (Hennadii Stepanov) Pull request description: No need to specify `$(package)_download_file` when it is equal to `$(package)_file_name`. Historically, before bitcoin#19817, distinct `$(package)_download_file` and `$(package)_file_name` were used for better portability (I guess) by removing `+` characters from a file name. The only package which still use file renaming is `native_capnp`: https://github.com/bitcoin/bitcoin/blob/eca694a4e78d54ce4e29b388b3e81b06e55c2293/depends/packages/native_capnp.mk#L3-L5 ACKs for top commit: shaavan: ACK d644c45 fanquake: ACK d644c45 Tree-SHA512: 488dd0f55cea077174e78a75d8385bacb1a5463883cadeb5fd7c9426865ea5f3a8bad0bd6e8e9d530bce6f0c1715349b3fbabb4e22634348cdd68f5fc8a3c53b
No need to specify
$(package)_download_filewhen it is equal to$(package)_file_name.Historically, before #19817, distinct
$(package)_download_fileand$(package)_file_namewere used for better portability (I guess) by removing+characters from a file name.The only package which still use file renaming is
native_capnp:bitcoin/depends/packages/native_capnp.mk
Lines 3 to 5 in eca694a