build: Drop ancient hack in gitian-linux descriptor #19622

pull hebasto wants to merge 2 commits into bitcoin:master from hebasto:200729-multilib changing 1 files +18 −54
  1. hebasto commented at 9:02 pm on July 29, 2020: member

    The hack was aimed to fix an issue in Ubuntu Trusty 14.04 (see #8188). The current hack implementation was added in #8315.

    On master (8db23349fe9b512e6801d59d17052c5a7a1c64df) this hack is effectively noop, and it is no longer needed.

    I see this PR as a step to removing libfaketime from gitian builds.

  2. hebasto commented at 9:07 pm on July 29, 2020: member
    @theuni Mind reviewing this PR as it removes the code added by you?
  3. DrahtBot added the label Build system on Jul 29, 2020
  4. DrahtBot added the label Scripts and tools on Jul 29, 2020
  5. DrahtBot commented at 11:10 pm on July 29, 2020: member

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

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #14066 (gitian-linux: Build binaries for 64-bit POWER by luke-jr)

    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.

  6. MarcoFalke added the label Needs gitian build on Jul 30, 2020
  7. dongcarl commented at 6:24 pm on July 30, 2020: member
    My 2c: When I was writing the Guix scripts, I didn’t include these hacks and the reproducibility worked out fine. I tried to build the Guix environment to be somewhat similar to the Ubuntu one, so I suspect this should work fine.
  8. dongcarl commented at 7:57 pm on July 30, 2020: member

    NACKish on only the 1ba14962434c4ec78757e46a0e3f8cc0a2fa114c commit

    • Dropping “ca-certificates” broke Gitian builds for me
    • I prefer being explicit about everything we need instead of relying on the dependencies between packages
  9. DrahtBot commented at 0:09 am on July 31, 2020: member

    Gitian builds

    File commit 2a784723f0c0e642353dc74ec6aef4d5f8345044(master) commit f82e1a11d01ed2702c612d325a653ff29bfb1c43(master and this pull)
    *-aarch64-linux-gnu-debug.tar.gz 80bc9e705a52b751... 623b047ba59a0604...
    *-aarch64-linux-gnu.tar.gz c3f5f7347062a05f... e8280449cac83c39...
    *-arm-linux-gnueabihf-debug.tar.gz d397c1b36f235647... 9590cab7d978d75a...
    *-arm-linux-gnueabihf.tar.gz fa9f6bc3abc43961... 3d9148bb202d4964...
    *-osx-unsigned.dmg 50995c631c583a20... fff2abbde6880929...
    *-osx64.tar.gz 7783f62092c36f30... b4b5a814d13c3f22...
    *-riscv64-linux-gnu-debug.tar.gz d66c6c20ae203d69... 6e738bb7c4926886...
    *-riscv64-linux-gnu.tar.gz 110b3f9b64a28ed6... b9a872e0e3d1ab54...
    *-win64-debug.zip 6bd62e3bea15f365... 6629078589d9c285...
    *-win64-setup-unsigned.exe 1aa0ec8b3bc1b371... 699e8a42950acd1f...
    *-win64.zip cb98dc72ee2dbab5... 218da94f14cf31c3...
    *-x86_64-linux-gnu-debug.tar.gz fabafa37d183a1bd... 65e33b6bc4d74021...
    *-x86_64-linux-gnu.tar.gz a5e063b1642dfc6d... 75e479ad25f5d06a...
    *.tar.gz b732a26c16a1353b... 47d124851e1bdaa4...
    bitcoin-core-linux-0.21-res.yml 11f239b543afa587... bef81716bdc0c3ea...
    bitcoin-core-osx-0.21-res.yml be39bf055890ed1c... 52bc5d5ab6fe5dcd...
    bitcoin-core-win-0.21-res.yml 1a2c547db7a2a530... 996a5abeed6cba5f...
    linux-build.log ae5a29e3293f709f... 6ad49333f40c2cd5...
    osx-build.log 4d83a3425139e341... 5b0c0d9a327b9d51...
    win-build.log 8327f0e5cafd18d3... dbb0b24e293eff97...
    bitcoin-core-linux-0.21-res.yml.diff 4ea42f17b79dfcff...
    bitcoin-core-osx-0.21-res.yml.diff 9b750b9bcd06809e...
    bitcoin-core-win-0.21-res.yml.diff fa53050f2626ce44...
    linux-build.log.diff 99b8e155bbec6b77...
    osx-build.log.diff de05d28b706f41d3...
    win-build.log.diff 39a5f00eb6e4eb30...
  10. DrahtBot removed the label Needs gitian build on Jul 31, 2020
  11. build: Drop old hack which is unneeded now
    This hack is described in #8188. The current implementation was
    introduced in #8315.
    95051682be
  12. hebasto force-pushed on Jul 31, 2020
  13. hebasto commented at 8:25 pm on July 31, 2020: member

    Updated d3fe00d90d1aa630b508550ae1f172f41f454114 -> f9da9691631732eb621bfef3b159aeaa3c8a2ee1 (pr19622.01 -> pr19622.02, diff).

    Addressed @dongcarl’s comment:

    • Dropping “ca-certificates” broke Gitian builds for me

    • I prefer being explicit about everything we need instead of relying on the dependencies between packages

    • all dependencies packages are installed explicitly, including the patch package
    • all gcc-8-{arch} packages are dependencies of respective g++-8-{arch} packages, and their listing seems overkill
    • missed g++-{arch} packages affect on gcov binary only, that is not used in gitian builds.
  14. fanquake commented at 1:16 pm on August 5, 2020: member

    Dropped unused ‘python3’ package.

    We need Python3 to run the security and symbol check scripts post build. I’d assume it’s still being installed as a side-effect of another package.

  15. build: Update and sort package list in gitian-linux.yml
    Virtual package 'binutils-gold' replaced with 'binutils'.
    Explicitly added 'patch' package.
    33a84e8f40
  16. hebasto commented at 3:09 pm on August 5, 2020: member

    @fanquake

    Dropped unused ‘python3’ package.

    We need Python3 to run the security and symbol check scripts post build. I’d assume it’s still being installed as a side-effect of another package.

    Indeed. I forgot about symbol-check.py and security-check.py.

  17. hebasto force-pushed on Aug 5, 2020
  18. hebasto commented at 3:12 pm on August 5, 2020: member

    Updated f9da9691631732eb621bfef3b159aeaa3c8a2ee1 -> 33a84e8f405ed6dd8885419cef305b4e6c7a428a (pr19622.02 -> pr19622.03, diff).

    Addressed @fanquake’s comment:

    We need Python3 to run the security and symbol check scripts post build. I’d assume it’s still being installed as a side-effect of another package.

  19. laanwj commented at 3:22 pm on August 7, 2020: member
    Code review ACK 33a84e8f405ed6dd8885419cef305b4e6c7a428a I would like to see at least one tested ACK that this is still deterministic, though.
  20. hebasto commented at 4:34 pm on August 7, 2020: member

    I would like to see at least one tested ACK that this is still deterministic, though.

    My hashes for comparison:

    0ae538b6274b08cf8c7a969ca26ec3e2980ddacb46a7bf4f76c47dd9f1eed63e9  bitcoin-33a84e8f405e-aarch64-linux-gnu-debug.tar.gz
    148d19b6a5f7e98e5274b6fcb2fe7df3b3a93610bcf5c8d3db68fff6bff21e382  bitcoin-33a84e8f405e-aarch64-linux-gnu.tar.gz
    22fd77cbc8c2f322c5c075547a3a2338f731ca055c2ac7f8a283a2a145e0bb54f  bitcoin-33a84e8f405e-arm-linux-gnueabihf-debug.tar.gz
    33fc9ef07934ada253a724d50f13eb0aa520ea05e6318e39b1d01e0959f1fec40  bitcoin-33a84e8f405e-arm-linux-gnueabihf.tar.gz
    4ceb2aaa73b100f96a8059c0807676f863e05c43160160a1fa66e4251a5129174  bitcoin-33a84e8f405e-riscv64-linux-gnu-debug.tar.gz
    53d5228b95768ded5f23d5d5e74589f79ada1d8cb1551c75db48c57a51f3fd5c6  bitcoin-33a84e8f405e-riscv64-linux-gnu.tar.gz
    66e56328ff4aed63fbdf4708b41e0003b8db07bf807a9331e426f3bebac02f547  bitcoin-33a84e8f405e-x86_64-linux-gnu-debug.tar.gz
    760f36255cd3d6209195cee3656a1af9100777b1311f2b274f0c162e10e4c8488  bitcoin-33a84e8f405e-x86_64-linux-gnu.tar.gz
    8e05a8d8acb85fa7b8639510ed7a098157311cd1535a4fa6b950cdf28342d1529  src/bitcoin-33a84e8f405e.tar.gz
    997a045ae326e5f0d19a11845f7ab9de2a15a68898b3cafed5edee3b637397cea  bitcoin-core-linux-0.21-res.yml
    
  21. dongcarl commented at 6:50 pm on August 7, 2020: member

    tACK 33a84e8f405e

    0- out_manifest: |
    1    ae538b6274b08cf8c7a969ca26ec3e2980ddacb46a7bf4f76c47dd9f1eed63e9  bitcoin-33a84e8f405e-aarch64-linux-gnu-debug.tar.gz
    2    48d19b6a5f7e98e5274b6fcb2fe7df3b3a93610bcf5c8d3db68fff6bff21e382  bitcoin-33a84e8f405e-aarch64-linux-gnu.tar.gz
    3    2fd77cbc8c2f322c5c075547a3a2338f731ca055c2ac7f8a283a2a145e0bb54f  bitcoin-33a84e8f405e-arm-linux-gnueabihf-debug.tar.gz
    4    3fc9ef07934ada253a724d50f13eb0aa520ea05e6318e39b1d01e0959f1fec40  bitcoin-33a84e8f405e-arm-linux-gnueabihf.tar.gz
    5    ceb2aaa73b100f96a8059c0807676f863e05c43160160a1fa66e4251a5129174  bitcoin-33a84e8f405e-riscv64-linux-gnu-debug.tar.gz
    6    3d5228b95768ded5f23d5d5e74589f79ada1d8cb1551c75db48c57a51f3fd5c6  bitcoin-33a84e8f405e-riscv64-linux-gnu.tar.gz
    7    6e56328ff4aed63fbdf4708b41e0003b8db07bf807a9331e426f3bebac02f547  bitcoin-33a84e8f405e-x86_64-linux-gnu-debug.tar.gz
    8    60f36255cd3d6209195cee3656a1af9100777b1311f2b274f0c162e10e4c8488  bitcoin-33a84e8f405e-x86_64-linux-gnu.tar.gz
    9    e05a8d8acb85fa7b8639510ed7a098157311cd1535a4fa6b950cdf28342d1529  src/bitcoin-33a84e8f405e.tar.gz
    
  22. fanquake merged this on Aug 10, 2020
  23. fanquake closed this on Aug 10, 2020

  24. hebasto deleted the branch on Aug 10, 2020
  25. sidhujag referenced this in commit 3b86ff3945 on Aug 10, 2020
  26. UdjinM6 referenced this in commit f56a708ee6 on Oct 23, 2021
  27. UdjinM6 referenced this in commit 7b7a783a3e on Oct 23, 2021
  28. UdjinM6 referenced this in commit 2899ea1d89 on Dec 4, 2021
  29. UdjinM6 referenced this in commit 632c759352 on Dec 5, 2021
  30. DrahtBot locked this on Feb 15, 2022

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-12-19 03:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me