build: Drop ancient hack in gitian-linux descriptor by hebasto · Pull Request #19622 · bitcoin/bitcoin

hebasto · 2020-07-29T21:02:02Z

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 (8db2334) this hack is effectively noop, and it is no longer needed.

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

hebasto · 2020-07-29T21:07:04Z

@theuni Mind reviewing this PR as it removes the code added by you?

DrahtBot · 2020-07-29T23:10:43Z

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

gitian-linux: Build binaries for 64-bit POWER #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.

dongcarl · 2020-07-30T18:24:32Z

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.

dongcarl · 2020-07-30T19:57:10Z

NACKish on only the 1ba1496 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

DrahtBot · 2020-07-31T00:09:26Z

Gitian builds

File	commit `2a78472` (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...`

This hack is described in bitcoin#8188. The current implementation was introduced in bitcoin#8315.

hebasto · 2020-07-31T20:25:01Z

Updated d3fe00d -> f9da969 (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.

fanquake · 2020-08-05T13:16:25Z

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.

Virtual package 'binutils-gold' replaced with 'binutils'. Explicitly added 'patch' package.

hebasto · 2020-08-05T15:09:04Z

@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.

hebasto · 2020-08-05T15:12:04Z

Updated f9da969 -> 33a84e8 (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.

laanwj · 2020-08-07T15:22:06Z

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

hebasto · 2020-08-07T16:34:44Z

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

My hashes for comparison:

ae538b6274b08cf8c7a969ca26ec3e2980ddacb46a7bf4f76c47dd9f1eed63e9  bitcoin-33a84e8f405e-aarch64-linux-gnu-debug.tar.gz
48d19b6a5f7e98e5274b6fcb2fe7df3b3a93610bcf5c8d3db68fff6bff21e382  bitcoin-33a84e8f405e-aarch64-linux-gnu.tar.gz
2fd77cbc8c2f322c5c075547a3a2338f731ca055c2ac7f8a283a2a145e0bb54f  bitcoin-33a84e8f405e-arm-linux-gnueabihf-debug.tar.gz
3fc9ef07934ada253a724d50f13eb0aa520ea05e6318e39b1d01e0959f1fec40  bitcoin-33a84e8f405e-arm-linux-gnueabihf.tar.gz
ceb2aaa73b100f96a8059c0807676f863e05c43160160a1fa66e4251a5129174  bitcoin-33a84e8f405e-riscv64-linux-gnu-debug.tar.gz
3d5228b95768ded5f23d5d5e74589f79ada1d8cb1551c75db48c57a51f3fd5c6  bitcoin-33a84e8f405e-riscv64-linux-gnu.tar.gz
6e56328ff4aed63fbdf4708b41e0003b8db07bf807a9331e426f3bebac02f547  bitcoin-33a84e8f405e-x86_64-linux-gnu-debug.tar.gz
60f36255cd3d6209195cee3656a1af9100777b1311f2b274f0c162e10e4c8488  bitcoin-33a84e8f405e-x86_64-linux-gnu.tar.gz
e05a8d8acb85fa7b8639510ed7a098157311cd1535a4fa6b950cdf28342d1529  src/bitcoin-33a84e8f405e.tar.gz
97a045ae326e5f0d19a11845f7ab9de2a15a68898b3cafed5edee3b637397cea  bitcoin-core-linux-0.21-res.yml

dongcarl · 2020-08-07T18:50:50Z

tACK 33a84e8

- out_manifest: |
    ae538b6274b08cf8c7a969ca26ec3e2980ddacb46a7bf4f76c47dd9f1eed63e9  bitcoin-33a84e8f405e-aarch64-linux-gnu-debug.tar.gz
    48d19b6a5f7e98e5274b6fcb2fe7df3b3a93610bcf5c8d3db68fff6bff21e382  bitcoin-33a84e8f405e-aarch64-linux-gnu.tar.gz
    2fd77cbc8c2f322c5c075547a3a2338f731ca055c2ac7f8a283a2a145e0bb54f  bitcoin-33a84e8f405e-arm-linux-gnueabihf-debug.tar.gz
    3fc9ef07934ada253a724d50f13eb0aa520ea05e6318e39b1d01e0959f1fec40  bitcoin-33a84e8f405e-arm-linux-gnueabihf.tar.gz
    ceb2aaa73b100f96a8059c0807676f863e05c43160160a1fa66e4251a5129174  bitcoin-33a84e8f405e-riscv64-linux-gnu-debug.tar.gz
    3d5228b95768ded5f23d5d5e74589f79ada1d8cb1551c75db48c57a51f3fd5c6  bitcoin-33a84e8f405e-riscv64-linux-gnu.tar.gz
    6e56328ff4aed63fbdf4708b41e0003b8db07bf807a9331e426f3bebac02f547  bitcoin-33a84e8f405e-x86_64-linux-gnu-debug.tar.gz
    60f36255cd3d6209195cee3656a1af9100777b1311f2b274f0c162e10e4c8488  bitcoin-33a84e8f405e-x86_64-linux-gnu.tar.gz
    e05a8d8acb85fa7b8639510ed7a098157311cd1535a4fa6b950cdf28342d1529  src/bitcoin-33a84e8f405e.tar.gz

33a84e8 build: Update and sort package list in gitian-linux.yml (Hennadii Stepanov) 9505168 build: Drop old hack which is unneeded now (Hennadii Stepanov) Pull request description: The hack was aimed to fix an issue in Ubuntu Trusty 14.04 (see bitcoin#8188). The current hack implementation was added in bitcoin#8315. On master (8db2334) this hack is effectively noop, and it is no longer needed. I see this PR as a step to removing `libfaketime` from gitian builds. ACKs for top commit: dongcarl: tACK 33a84e8 laanwj: Code review ACK 33a84e8 Tree-SHA512: 90036c555a500649ccc3d108bf11f09a9cfd2c92c0b598f7e0c0df63a713ae7abaf78f350b68c025470619c967223f45f6a235ad37a6ce1d1a0341ed34963ba0

Merges: bitcoin#16184, bitcoin#17029, bitcoin#17308, bitcoin#17409, bitcoin#17483, bitcoin#17756, bitcoin#18331, bitcoin#18556, bitcoin#19622; partial merges: bitcoin#16327, bitcoin#18104, bitcoin#18741, bitcoin#20318, bitcoin#21036

DrahtBot added Build system Scripts and tools labels Jul 29, 2020

maflcko added the Needs gitian build label Jul 30, 2020

DrahtBot mentioned this pull request Jul 30, 2020

gitian-linux: Build binaries for 64-bit POWER #14066

Closed

hebasto mentioned this pull request Jul 30, 2020

build: Drop per-host faketime wrappers in gitian-linux build #19627

Closed

DrahtBot removed the Needs gitian build label Jul 31, 2020

build: Drop old hack which is unneeded now

9505168

This hack is described in bitcoin#8188. The current implementation was introduced in bitcoin#8315.

hebasto force-pushed the 200729-multilib branch from d3fe00d to f9da969 Compare July 31, 2020 20:12

build: Update and sort package list in gitian-linux.yml

33a84e8

Virtual package 'binutils-gold' replaced with 'binutils'. Explicitly added 'patch' package.

hebasto force-pushed the 200729-multilib branch from f9da969 to 33a84e8 Compare August 5, 2020 15:09

fanquake merged commit f306384 into bitcoin:master Aug 10, 2020

hebasto deleted the 200729-multilib branch August 10, 2020 12:19

bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

build: Drop ancient hack in gitian-linux descriptor#19622
fanquake merged 2 commits intobitcoin:masterfrom
hebasto:200729-multilib

hebasto commented Jul 29, 2020 •

edited

Loading

Uh oh!

hebasto commented Jul 29, 2020

Uh oh!

DrahtBot commented Jul 29, 2020 •

edited

Loading

Uh oh!

dongcarl commented Jul 30, 2020

Uh oh!

dongcarl commented Jul 30, 2020 •

edited

Loading

Uh oh!

DrahtBot commented Jul 31, 2020

Uh oh!

hebasto commented Jul 31, 2020

Uh oh!

fanquake commented Aug 5, 2020

Uh oh!

hebasto commented Aug 5, 2020

Uh oh!

hebasto commented Aug 5, 2020

Uh oh!

laanwj commented Aug 7, 2020 •

edited

Loading

Uh oh!

hebasto commented Aug 7, 2020

Uh oh!

dongcarl commented Aug 7, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

hebasto commented Jul 29, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hebasto commented Jul 29, 2020

Uh oh!

DrahtBot commented Jul 29, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Conflicts

Uh oh!

dongcarl commented Jul 30, 2020

Uh oh!

dongcarl commented Jul 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DrahtBot commented Jul 31, 2020

Gitian builds

Uh oh!

hebasto commented Jul 31, 2020

Uh oh!

fanquake commented Aug 5, 2020

Uh oh!

hebasto commented Aug 5, 2020

Uh oh!

hebasto commented Aug 5, 2020

Uh oh!

laanwj commented Aug 7, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hebasto commented Aug 7, 2020

Uh oh!

dongcarl commented Aug 7, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

hebasto commented Jul 29, 2020 •

edited

Loading

DrahtBot commented Jul 29, 2020 •

edited

Loading

dongcarl commented Jul 30, 2020 •

edited

Loading

laanwj commented Aug 7, 2020 •

edited

Loading