This was required to allow gitian builds on non-amd64 architecture, however, it seems to break the current builds (with lxc), see #17409 (comment)
Also, the gititan builds wouldn't be deterministic across arches anyway, see #17468
So instead of wasting more time on this, revert the change and hope that guix allows to compile on non-amd64 architectures.
-BEGIN VERIFY SCRIPT-
sed -i -e 's|"linux64"|"amd64"|g' $(git grep -l '"linux64"')
-END VERIFY SCRIPT-
I really like the idea of not hardcoding the architecture in the descriptor.
Maybe we could change gitian instead, to use the local architecture, so simply use the existing amd64 base image, when 'linux64' is used in the descriptor, assuming it is running on amd64.
Also, the gititan builds wouldn't be deterministic across arches anyway, see #17468
That is probably worth investigating in detail! Guix is not a panacea, it will likely run into similar problems.
(Edit: to be clear, not NACKing this, but making the build infrastructure architecture independent seemed like the clear way forward, not something to go back and forth on)
<!--a722867cd34abeea1fadc8d60700f111-->
| File | commit 21ee676dd6a7d9704367b6412bf8e1e443ec2b5b<br>(master) | commit 664bc9759ff26da8e85f461c580089bcd6d8b482<br>(master and this pull) |
|---|---|---|
| bitcoin-0.19.99-aarch64-linux-gnu-debug.tar.gz | 82564312bb7411d9... |
38770d88e89b0178... |
| bitcoin-0.19.99-aarch64-linux-gnu.tar.gz | be5cd7f9fdc7eee5... |
fea81f4af8106ada... |
| bitcoin-0.19.99-arm-linux-gnueabihf-debug.tar.gz | e4cf2015068b962a... |
ea8d4771bc3fa8c2... |
| bitcoin-0.19.99-arm-linux-gnueabihf.tar.gz | 3aa3f2bfe3504583... |
8eb6ae1477d51f37... |
| bitcoin-0.19.99-i686-pc-linux-gnu-debug.tar.gz | db7de79d1909c494... |
2da806f2360b0688... |
| bitcoin-0.19.99-i686-pc-linux-gnu.tar.gz | 1a1b1316314781e8... |
dcd27e29e8dfa205... |
| bitcoin-0.19.99-osx-unsigned.dmg | 5d7eb2dbe082dad1... |
2a24ed82f5f25505... |
| bitcoin-0.19.99-osx64.tar.gz | 367aeb702fdbd1ff... |
f2ad0d56050f7ad1... |
| bitcoin-0.19.99-riscv64-linux-gnu-debug.tar.gz | f8e0238d860adff1... |
9cec0044c63aa620... |
| bitcoin-0.19.99-riscv64-linux-gnu.tar.gz | e833b4dd960b05b6... |
9411c08501480563... |
| bitcoin-0.19.99-win64-debug.zip | c497af21828767a0... |
0fb244d4e39519e9... |
| bitcoin-0.19.99-win64-setup-unsigned.exe | 1d99c5c0f8921007... |
832b78b4f4618751... |
| bitcoin-0.19.99-win64.zip | 6092ed6165d469bd... |
50b37efd3c5aca98... |
| bitcoin-0.19.99-x86_64-linux-gnu-debug.tar.gz | 407958bac1a458b9... |
9c1891ad3e092a0d... |
| bitcoin-0.19.99-x86_64-linux-gnu.tar.gz | c93a48dfa05408b9... |
6a25dbc3ca0f795e... |
| bitcoin-0.19.99.tar.gz | 3c3518fadeafcdcf... |
1f03ca1471ab1b0b... |
| bitcoin-core-linux-0.20-res.yml | 62d104a8b4243066... |
b46b05093528b0e4... |
| bitcoin-core-osx-0.20-res.yml | 90b0eab16ee42beb... |
541cba13461ceb92... |
| bitcoin-core-win-0.20-res.yml | ddb9ff7e68a3eb97... |
82f0d320a873117a... |
| linux-build.log | ceeb8cb8e36fa6d5... |
dead859a0d4011b6... |
| osx-build.log | 86d92cb2a0cbc889... |
45c7eb8c7f30eba9... |
| win-build.log | f90bde45ee73d23a... |
e7ff84fe4aa146a3... |
| bitcoin-core-linux-0.20-res.yml.diff | b92097b48c1232b8... |
|
| bitcoin-core-osx-0.20-res.yml.diff | 7a9aa68d40852002... |
|
| bitcoin-core-win-0.20-res.yml.diff | 03bd58451e592e89... |
|
| linux-build.log.diff | 4f140570c9d5a056... |
|
| osx-build.log.diff | 00764af3364f4c03... |
|
| win-build.log.diff | 4256002454db0346... |
Labeled this for 0.20 so we can merge it if no other changes are done to gitian to support architecture-independent builds.
Going to merge this now, because I'd like to see https://bitcoin.jonasschnelli.ch/ working before the release of 0.20.
Ping @jonasschnelli :smiling_imp:
Milestone
0.20.0