Skip to content

depends: cleanup meta files#34755

Merged
fanquake merged 2 commits intobitcoin:masterfrom
fanquake:qt_no_sbom
Mar 11, 2026
Merged

depends: cleanup meta files#34755
fanquake merged 2 commits intobitcoin:masterfrom
fanquake:qt_no_sbom

Conversation

@fanquake
Copy link
Member

@fanquake fanquake commented Mar 6, 2026

1 followup to #34650, to disable sbom generation.
1 commit to Boost, to cleanup .natvis files that end up in share.

@DrahtBot
Copy link
Contributor

DrahtBot commented Mar 6, 2026

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK hebasto

If your review is incorrectly listed, please copy-paste <!--meta-tag:bot-skip--> into the comment that the bot should ignore.

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 0ebc689, tested on Ubuntu 25.10.

We're not using any of those files.

Comment on lines +28 to +30
define $(package)_postprocess_cmds
rm -rf share
endef
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, there is no Boost's CMake variable to exclude *.natvis files.

@fanquake
Copy link
Member Author

Guix Build (x86_64):

1d470d3079f8aca86d223ba0595d927775b97d3397ca1c477dae4f966dbaaef0  guix-build-0ebc6891e216/output/aarch64-linux-gnu/SHA256SUMS.part
2a80a94e3d690ffd6ae6cd4a4819118ff04df28f9ccd84a0fd04134c1553a6c3  guix-build-0ebc6891e216/output/aarch64-linux-gnu/bitcoin-0ebc6891e216-aarch64-linux-gnu-debug.tar.gz
e0886d0ae5a776c4cafa9bab7ee8448629575dbf25578f6f975ba918849cf2b7  guix-build-0ebc6891e216/output/aarch64-linux-gnu/bitcoin-0ebc6891e216-aarch64-linux-gnu.tar.gz
d5cacdb64c0c8e077a0def0f2da0eb16c4339b1c7763e1aeb70405898ac26ba3  guix-build-0ebc6891e216/output/arm-linux-gnueabihf/SHA256SUMS.part
0a2ab75ccfe09763c48a859b195ad22cdf13c9dac413b59230839145ee69fa00  guix-build-0ebc6891e216/output/arm-linux-gnueabihf/bitcoin-0ebc6891e216-arm-linux-gnueabihf-debug.tar.gz
0241029e04ef2511ac338a2164d05ff6215a38141de41452661bf3d657b070b5  guix-build-0ebc6891e216/output/arm-linux-gnueabihf/bitcoin-0ebc6891e216-arm-linux-gnueabihf.tar.gz
e9c6b99fbec816e7e6ba96ec697b96b426a18563b2941573988b9cb4a6862ffb  guix-build-0ebc6891e216/output/arm64-apple-darwin/SHA256SUMS.part
b9bc4b8c7769fb3d12530a9c8b55c212fd008f15548224e540278e70169aa503  guix-build-0ebc6891e216/output/arm64-apple-darwin/bitcoin-0ebc6891e216-arm64-apple-darwin-codesigning.tar.gz
4661c10803dc48d87ddd682864323f3969b214736082326a9a4eb0e7b15f076c  guix-build-0ebc6891e216/output/arm64-apple-darwin/bitcoin-0ebc6891e216-arm64-apple-darwin-unsigned.tar.gz
c8298f48bf39a0029e401919c4daaa27d82b7868069172bbec63f01ffe24f183  guix-build-0ebc6891e216/output/arm64-apple-darwin/bitcoin-0ebc6891e216-arm64-apple-darwin-unsigned.zip
4111272bda23c91d2ac14df4a0c029d863e77443438509126e970fdfc66d6de9  guix-build-0ebc6891e216/output/dist-archive/bitcoin-0ebc6891e216.tar.gz
a119d4bc7e7cf00e569428b07fbdc41a7ac8e3a91109552f0a9cfd23eb8da51a  guix-build-0ebc6891e216/output/powerpc64-linux-gnu/SHA256SUMS.part
8b01f0bde42d8ca63aeccc46bcb9b2f907e8544b10c210eeeb089bba1a0cd0e2  guix-build-0ebc6891e216/output/powerpc64-linux-gnu/bitcoin-0ebc6891e216-powerpc64-linux-gnu-debug.tar.gz
3b9357421f5f614926f0f8bd12e6c13fe9e430a8b0b8101d4418b878ba21813e  guix-build-0ebc6891e216/output/powerpc64-linux-gnu/bitcoin-0ebc6891e216-powerpc64-linux-gnu.tar.gz
6491a00ce789a5acc0ce185e8166480f7d8970adde6c8ebbb5c0125e02612daa  guix-build-0ebc6891e216/output/riscv64-linux-gnu/SHA256SUMS.part
a2e2bf012a3ef95cb228a0231efc958133c231ee12049148cd8e26775b4ea450  guix-build-0ebc6891e216/output/riscv64-linux-gnu/bitcoin-0ebc6891e216-riscv64-linux-gnu-debug.tar.gz
9f47af47f594f0c7c9ad8098a628402efd4c7db88f8d86343ce41f6ea0d24f9b  guix-build-0ebc6891e216/output/riscv64-linux-gnu/bitcoin-0ebc6891e216-riscv64-linux-gnu.tar.gz
98c7ebb8e6caece8df8984d6db1d06a75b59f0ee9cb66bddff7be2aee7335f22  guix-build-0ebc6891e216/output/x86_64-apple-darwin/SHA256SUMS.part
f0e275c09c508f4ed187a6557301685e206509cbf8754cfa73157eb99c7f67af  guix-build-0ebc6891e216/output/x86_64-apple-darwin/bitcoin-0ebc6891e216-x86_64-apple-darwin-codesigning.tar.gz
3cac318dee65a877ec1fbf1277ccee315b519443ded37128fd83e8cc85c0863e  guix-build-0ebc6891e216/output/x86_64-apple-darwin/bitcoin-0ebc6891e216-x86_64-apple-darwin-unsigned.tar.gz
e6d7572ebb52e809fbff574216c770fc6169285a89b1d34adfe1c21d1a03f9b4  guix-build-0ebc6891e216/output/x86_64-apple-darwin/bitcoin-0ebc6891e216-x86_64-apple-darwin-unsigned.zip
c995afcb34ae9c548db2105a5c3adcb53a3f3c5dbbdd915acad7b630e795ece8  guix-build-0ebc6891e216/output/x86_64-linux-gnu/SHA256SUMS.part
f07ff630cdaf6d936e0163bdc0c8c6f618c690e63adb0a8a519644feef205dc2  guix-build-0ebc6891e216/output/x86_64-linux-gnu/bitcoin-0ebc6891e216-x86_64-linux-gnu-debug.tar.gz
b8544429c410c0b32cef0adcf17cc052ed19e5c6082c9945bc5c739f54bfd4ac  guix-build-0ebc6891e216/output/x86_64-linux-gnu/bitcoin-0ebc6891e216-x86_64-linux-gnu.tar.gz
09199389a3b30e14fa960118629662e2f12277e1270572607bbc465bf3c4a5b7  guix-build-0ebc6891e216/output/x86_64-w64-mingw32/SHA256SUMS.part
3823cbb6504cde4d593f58ff354c5a9d77f8222ccf2b882fd1270293380b35de  guix-build-0ebc6891e216/output/x86_64-w64-mingw32/bitcoin-0ebc6891e216-win64-codesigning.tar.gz
bbaaf1ca435d2302e9c83b95503f8d588ca6af439720b46083da5bc50d67bce6  guix-build-0ebc6891e216/output/x86_64-w64-mingw32/bitcoin-0ebc6891e216-win64-debug.zip
26f499aafc1f6e7995deab8645c3883cd6b6bb02c4270ec0a7eb1babfad69a39  guix-build-0ebc6891e216/output/x86_64-w64-mingw32/bitcoin-0ebc6891e216-win64-setup-unsigned.exe
5aadaaff0a77aa2559a96bce6d7bda7a48771e48f32c2ad213344f1045586706  guix-build-0ebc6891e216/output/x86_64-w64-mingw32/bitcoin-0ebc6891e216-win64-unsigned.zip

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My Guix build:

aarch64
1d470d3079f8aca86d223ba0595d927775b97d3397ca1c477dae4f966dbaaef0  guix-build-0ebc6891e216/output/aarch64-linux-gnu/SHA256SUMS.part
2a80a94e3d690ffd6ae6cd4a4819118ff04df28f9ccd84a0fd04134c1553a6c3  guix-build-0ebc6891e216/output/aarch64-linux-gnu/bitcoin-0ebc6891e216-aarch64-linux-gnu-debug.tar.gz
e0886d0ae5a776c4cafa9bab7ee8448629575dbf25578f6f975ba918849cf2b7  guix-build-0ebc6891e216/output/aarch64-linux-gnu/bitcoin-0ebc6891e216-aarch64-linux-gnu.tar.gz
d5cacdb64c0c8e077a0def0f2da0eb16c4339b1c7763e1aeb70405898ac26ba3  guix-build-0ebc6891e216/output/arm-linux-gnueabihf/SHA256SUMS.part
0a2ab75ccfe09763c48a859b195ad22cdf13c9dac413b59230839145ee69fa00  guix-build-0ebc6891e216/output/arm-linux-gnueabihf/bitcoin-0ebc6891e216-arm-linux-gnueabihf-debug.tar.gz
0241029e04ef2511ac338a2164d05ff6215a38141de41452661bf3d657b070b5  guix-build-0ebc6891e216/output/arm-linux-gnueabihf/bitcoin-0ebc6891e216-arm-linux-gnueabihf.tar.gz
e9c6b99fbec816e7e6ba96ec697b96b426a18563b2941573988b9cb4a6862ffb  guix-build-0ebc6891e216/output/arm64-apple-darwin/SHA256SUMS.part
b9bc4b8c7769fb3d12530a9c8b55c212fd008f15548224e540278e70169aa503  guix-build-0ebc6891e216/output/arm64-apple-darwin/bitcoin-0ebc6891e216-arm64-apple-darwin-codesigning.tar.gz
4661c10803dc48d87ddd682864323f3969b214736082326a9a4eb0e7b15f076c  guix-build-0ebc6891e216/output/arm64-apple-darwin/bitcoin-0ebc6891e216-arm64-apple-darwin-unsigned.tar.gz
c8298f48bf39a0029e401919c4daaa27d82b7868069172bbec63f01ffe24f183  guix-build-0ebc6891e216/output/arm64-apple-darwin/bitcoin-0ebc6891e216-arm64-apple-darwin-unsigned.zip
4111272bda23c91d2ac14df4a0c029d863e77443438509126e970fdfc66d6de9  guix-build-0ebc6891e216/output/dist-archive/bitcoin-0ebc6891e216.tar.gz
a119d4bc7e7cf00e569428b07fbdc41a7ac8e3a91109552f0a9cfd23eb8da51a  guix-build-0ebc6891e216/output/powerpc64-linux-gnu/SHA256SUMS.part
8b01f0bde42d8ca63aeccc46bcb9b2f907e8544b10c210eeeb089bba1a0cd0e2  guix-build-0ebc6891e216/output/powerpc64-linux-gnu/bitcoin-0ebc6891e216-powerpc64-linux-gnu-debug.tar.gz
3b9357421f5f614926f0f8bd12e6c13fe9e430a8b0b8101d4418b878ba21813e  guix-build-0ebc6891e216/output/powerpc64-linux-gnu/bitcoin-0ebc6891e216-powerpc64-linux-gnu.tar.gz
6491a00ce789a5acc0ce185e8166480f7d8970adde6c8ebbb5c0125e02612daa  guix-build-0ebc6891e216/output/riscv64-linux-gnu/SHA256SUMS.part
a2e2bf012a3ef95cb228a0231efc958133c231ee12049148cd8e26775b4ea450  guix-build-0ebc6891e216/output/riscv64-linux-gnu/bitcoin-0ebc6891e216-riscv64-linux-gnu-debug.tar.gz
9f47af47f594f0c7c9ad8098a628402efd4c7db88f8d86343ce41f6ea0d24f9b  guix-build-0ebc6891e216/output/riscv64-linux-gnu/bitcoin-0ebc6891e216-riscv64-linux-gnu.tar.gz
98c7ebb8e6caece8df8984d6db1d06a75b59f0ee9cb66bddff7be2aee7335f22  guix-build-0ebc6891e216/output/x86_64-apple-darwin/SHA256SUMS.part
f0e275c09c508f4ed187a6557301685e206509cbf8754cfa73157eb99c7f67af  guix-build-0ebc6891e216/output/x86_64-apple-darwin/bitcoin-0ebc6891e216-x86_64-apple-darwin-codesigning.tar.gz
3cac318dee65a877ec1fbf1277ccee315b519443ded37128fd83e8cc85c0863e  guix-build-0ebc6891e216/output/x86_64-apple-darwin/bitcoin-0ebc6891e216-x86_64-apple-darwin-unsigned.tar.gz
e6d7572ebb52e809fbff574216c770fc6169285a89b1d34adfe1c21d1a03f9b4  guix-build-0ebc6891e216/output/x86_64-apple-darwin/bitcoin-0ebc6891e216-x86_64-apple-darwin-unsigned.zip
c995afcb34ae9c548db2105a5c3adcb53a3f3c5dbbdd915acad7b630e795ece8  guix-build-0ebc6891e216/output/x86_64-linux-gnu/SHA256SUMS.part
f07ff630cdaf6d936e0163bdc0c8c6f618c690e63adb0a8a519644feef205dc2  guix-build-0ebc6891e216/output/x86_64-linux-gnu/bitcoin-0ebc6891e216-x86_64-linux-gnu-debug.tar.gz
b8544429c410c0b32cef0adcf17cc052ed19e5c6082c9945bc5c739f54bfd4ac  guix-build-0ebc6891e216/output/x86_64-linux-gnu/bitcoin-0ebc6891e216-x86_64-linux-gnu.tar.gz
09199389a3b30e14fa960118629662e2f12277e1270572607bbc465bf3c4a5b7  guix-build-0ebc6891e216/output/x86_64-w64-mingw32/SHA256SUMS.part
3823cbb6504cde4d593f58ff354c5a9d77f8222ccf2b882fd1270293380b35de  guix-build-0ebc6891e216/output/x86_64-w64-mingw32/bitcoin-0ebc6891e216-win64-codesigning.tar.gz
bbaaf1ca435d2302e9c83b95503f8d588ca6af439720b46083da5bc50d67bce6  guix-build-0ebc6891e216/output/x86_64-w64-mingw32/bitcoin-0ebc6891e216-win64-debug.zip
26f499aafc1f6e7995deab8645c3883cd6b6bb02c4270ec0a7eb1babfad69a39  guix-build-0ebc6891e216/output/x86_64-w64-mingw32/bitcoin-0ebc6891e216-win64-setup-unsigned.exe
5aadaaff0a77aa2559a96bce6d7bda7a48771e48f32c2ad213344f1045586706  guix-build-0ebc6891e216/output/x86_64-w64-mingw32/bitcoin-0ebc6891e216-win64-unsigned.zip

@fanquake fanquake merged commit 7c21413 into bitcoin:master Mar 11, 2026
26 checks passed
fanquake added a commit to fanquake/bitcoin that referenced this pull request Mar 11, 2026
fanquake added a commit to fanquake/bitcoin that referenced this pull request Mar 11, 2026
@fanquake fanquake mentioned this pull request Mar 11, 2026
@fanquake fanquake deleted the qt_no_sbom branch March 11, 2026 12:06
@fanquake
Copy link
Member Author

Backported to 31.x in #34800.

fanquake added a commit to fanquake/bitcoin that referenced this pull request Mar 12, 2026
fanquake added a commit to fanquake/bitcoin that referenced this pull request Mar 12, 2026
@DrahtBot
Copy link
Contributor

Guix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]

File commit 9aea290
(master)
commit a47f6ae
(pull/34755/merge)
*-aarch64-linux-gnu-debug.tar.gz f5dd29c0a1a6fcf3... 0a0fa231bd3e210d...
*-aarch64-linux-gnu.tar.gz 6a46aaf77ee84cba... a7967e3e7367d081...
*-arm-linux-gnueabihf-debug.tar.gz 33be53bc6d2c488e... b4ab54dcc237ac8f...
*-arm-linux-gnueabihf.tar.gz 7bd1327fe172308b... 882e2d520cfef2fa...
*-arm64-apple-darwin-codesigning.tar.gz 8879f3465c5a30b5... 57b2ce3b7c5e2959...
*-arm64-apple-darwin-unsigned.tar.gz 551d7bd8502e1a12... 5733b75fd17ac4d8...
*-arm64-apple-darwin-unsigned.zip 186a86588acb35c6... 0ebb19a95536fb72...
*-powerpc64-linux-gnu-debug.tar.gz 7e08f84db681aa3f... b562881cf198900d...
*-powerpc64-linux-gnu.tar.gz 210e7edd65b7afe0... ed8cd3c2536309ff...
*-riscv64-linux-gnu-debug.tar.gz 39352146ff87bcb1... 5b8719a4b6c5faee...
*-riscv64-linux-gnu.tar.gz c2c8737163c55205... d43f2b62d57cbdc7...
*-win64-codesigning.tar.gz baec9eb6d983fdc9... c278ab5e8c28fff5...
*-win64-debug.zip 6e61ac1ffe3f92da... 2f54df0757b30dd8...
*-win64-setup-unsigned.exe 4345b1180a2ef0eb... 536aefe53d52a7f6...
*-win64-unsigned.zip bd607c94ddf6e511... 344d659945d5a8f6...
*-x86_64-apple-darwin-codesigning.tar.gz c67f0b2c00ca4c88... 79364caf60b97c61...
*-x86_64-apple-darwin-unsigned.tar.gz 460f21b68a8bdd39... 97134443c10b7e47...
*-x86_64-apple-darwin-unsigned.zip 02abf5296eea951c... 86ab7cf0028204d2...
*-x86_64-linux-gnu-debug.tar.gz b4a89d26fa562ba6... 9ebabdbda06bf01f...
*-x86_64-linux-gnu.tar.gz 442d2987a6a5b33f... 6a8ac0462def6f0b...
*.tar.gz 5156b105b179331a... 9b9531c397778f52...
SHA256SUMS.part c5f6f31601f9fff1... e15a437185b56a5c...
guix_build.log e4d824e800c66caf... b3d23de4a2c611a4...
guix_build.log.diff 4e930f32623e28fe...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants