Skip to content

Commit ca85449

Browse files
author
MarcoFalke
committed
Merge bitcoin#21036: gitian: Bump descriptors to Focal for 22.0
2ecaf21 gitian: remove execstack workaround for ricv64 & powerpc64le (fanquake) 5baff2b build: use focal in gitian descriptors (fanquake) Pull request description: This PR changes the gitian descriptors to use Ubuntu Focal (20.04), over Bionic (18.04), moving from GCC 7.5 to GCC 8.4 for native Linux builds, mingw-w64 GCC 7.3 to mingw-w64 GCC 9.3 for Windows builds, while continuing to use GCC 8.4 for all cross builds and Clang 8.0.0 for macOS builds. It also drops the `-Wl,-z,noexecstack` workaround we've been using for the riscv64 and powerpc64le hosts, as it's no-longer needed. One new package is installed in the osx build, `libtinfo5`, as libtinfo5.so is required by our downloaded Clang 8. A bump to Focal will at least be required if we want to update to a newer Qt (5.15, bitcoin#19716) for 22.0, as we need a newer version of [`g++-mingw-w64`](https://packages.ubuntu.com/focal/g++-mingw-w64-x86-64) and the [`mingw-w64`](https://mingw-w64.org/doku.php) headers. This can still be done while continuing to use GCC 8.4 for Linux builds (see below), however the newer `g++-mingw-w64` will be based off of GCC 9.3. **Some considerations** GCC 9 is affected by bitcoin#20005 "memcmp with constants that contain zero bytes are broken in GCC", and the newer `g++-mingw-w64` will be based off of GCC 9.3. The `--no-*` variants of the Windows linker flags (i.e `--no-dynamicbase`) we use to [test our `security-check.py` script](https://github.com/bitcoin/bitcoin/blob/16b784d953365bb2d7ae65acd2b20a79ef8ba7b6/contrib/devtools/test-security-check.py#L53) are not patched into the mingw binutils in Focal (they have been re-added in Groovy (20.10)). This isn't currently an issue, however, we might add a call to `test-security-check` for Guix (bitcoin#20980), and if we wanted to do the same for gitian, it would not work. Note how it's quite "easy" for us to apply the `--no-*` variant patch to our Guix build; it would be quite a bit harder to do in Gitian. Gitian Builds @ 2ecaf21 #### Linux ```bash 8882ea78486fbae4fac574b9089eb1107c6372d0dd7dfcda4f0f930576f9d6c1 bitcoin-2ecaf214331b-aarch64-linux-gnu-debug.tar.gz 50a9e30943b4eee5163edff3331241e745ff32a2c4463c21a6fdc5986e2d0383 bitcoin-2ecaf214331b-aarch64-linux-gnu.tar.gz ec4e55a447fddf033fee33cd5f22bfeda3c3612f059194bcf6238859f7989d7a bitcoin-2ecaf214331b-arm-linux-gnueabihf-debug.tar.gz 444fe1b3b933c00bcbd4a9d86888cff3b61c1215b1debccd2843e842d1224777 bitcoin-2ecaf214331b-arm-linux-gnueabihf.tar.gz 88e486ff465980dc1a4aab9687d142ec6f727ed2c52cf539f69db2877dee83b2 bitcoin-2ecaf214331b-powerpc64-linux-gnu-debug.tar.gz 66144ac264c65cada9d86446e6026c85b04fb88198b8f41b42840f6031db3e6c bitcoin-2ecaf214331b-powerpc64-linux-gnu.tar.gz 34bcc13d78d929d575e34e77a6672f23ca7ea23230b28ec2eed563889352ba86 bitcoin-2ecaf214331b-powerpc64le-linux-gnu-debug.tar.gz b4c5f959664f3063df4330edfe343c17120eb6b556ee1c15c4aeb2c1c54ffd49 bitcoin-2ecaf214331b-powerpc64le-linux-gnu.tar.gz 918fa72ab6f6ebce4e9663c93f72fe26651c260477cbb54749f7eb61438b5cc1 bitcoin-2ecaf214331b-riscv64-linux-gnu-debug.tar.gz f704f9f8c053ffe37d854e2e81e0f4c0614c435dad7f5d82518c681b73a76ae6 bitcoin-2ecaf214331b-riscv64-linux-gnu.tar.gz b59e3a62f1df9d79f30e916b3c9655f654036fe3a420040c53acc8dd9f4162c5 bitcoin-2ecaf214331b-x86_64-linux-gnu-debug.tar.gz a4dc9ca877cc97544e65db11be38406d16f15d74fcdcd2318bb92474729bc60d bitcoin-2ecaf214331b-x86_64-linux-gnu.tar.gz b40ba2d5da498330ade92a4ccebcceb1452b94c8ffeacb336f87e93b5c88d8af src/bitcoin-2ecaf214331b.tar.gz af6ebc91147778e4e6705eade62608dde4d6e60522d79087fa9129bdb7c01199 bitcoin-core-linux-22-res.yml ``` #### Windows ```bash 121a3970a6911cb8c453b2ce37d03f6cbb43333e29db8fa516c68563fb367f43 bitcoin-2ecaf214331b-win-unsigned.tar.gz 6294e9efebe935092f9ba119dc60ad4094f18b51c4181324e54d3057524d6101 bitcoin-2ecaf214331b-win64-debug.zip 5b5a236b63e67f5f6c07ad9aa716aa7b72fb63722c96798b332c6d164738f9cf bitcoin-2ecaf214331b-win64-setup-unsigned.exe c1fa5894c5e02a201637567c80b9bde9024f44673dcd06fd4d489c1709179279 bitcoin-2ecaf214331b-win64.zip b40ba2d5da498330ade92a4ccebcceb1452b94c8ffeacb336f87e93b5c88d8af src/bitcoin-2ecaf214331b.tar.gz 665fd7eb61aed368150db58a254f15fb5efb51a4efa5abcc52571cb7a1a5de22 bitcoin-core-win-22-res.yml ``` #### macOS ```bash 6a1deae7662aa782baa82a42590f862c6bcdc4f4e38daa9b8c2a9eed1fbb5397 bitcoin-2ecaf214331b-osx-unsigned.dmg 1ee843266e84928a4323fa255c833528c2617a2c9fd2f98fb26ba19bbfc1227b bitcoin-2ecaf214331b-osx-unsigned.tar.gz 097b64dadc167d8e5b733421bf1541a40760ad952990f7cf3f35adc6ae2616d0 bitcoin-2ecaf214331b-osx64.tar.gz b40ba2d5da498330ade92a4ccebcceb1452b94c8ffeacb336f87e93b5c88d8af src/bitcoin-2ecaf214331b.tar.gz 6e378fb543928e40c7119b96be6ff773d38506a9a888f8b02c7f1b8a0801a80e bitcoin-core-osx-22-res.yml ``` ACKs for top commit: laanwj: Build script changes review ACK 2ecaf21 Tree-SHA512: 975d5830b787d2e08988f43cbc6e839294171c1d94c8219636308b05f9b77041421612ae67be24a631674670cfc9c2d96d8177f2b3158a78fc3deea19631febf
2 parents c969ab4 + 2ecaf21 commit ca85449

8 files changed

+16
-14
lines changed

ci/test/00_setup_env_mac.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_macos_cross
10-
export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic can cross-compile to macos (bionic is used in the gitian build as well)
10+
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos (Focal is used in the gitian build as well)
1111
export HOST=x86_64-apple-darwin18
1212
export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools xorriso"
1313
export XCODE_VERSION=11.3.1

ci/test/00_setup_env_win64.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_win64
10-
export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic can cross-compile to win64 (bionic is used in the gitian build as well)
10+
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to win64 (Focal is used in the gitian build as well)
1111
export HOST=x86_64-w64-mingw32
1212
export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64 file"
1313
export RUN_FUNCTIONAL_TESTS=false
14-
export RUN_SECURITY_TESTS="true"
1514
export GOAL="deploy"
1615
export BITCOIN_CONFIG="--enable-reduce-exports --disable-fuzz-binary --disable-gui-tests --without-boost-process"
1716

contrib/gitian-build.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ def setup():
3535
if not os.path.isdir('bitcoin'):
3636
subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin/bitcoin.git'])
3737
os.chdir('gitian-builder')
38-
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
38+
make_image_prog = ['bin/make-base-vm', '--suite', 'focal', '--arch', 'amd64']
3939
if args.docker:
4040
make_image_prog += ['--docker']
4141
elif not args.kvm:
4242
make_image_prog += ['--lxc']
4343
subprocess.check_call(make_image_prog)
4444
os.chdir(workdir)
45-
if args.is_bionic and not args.kvm and not args.docker:
45+
if args.is_focal and not args.kvm and not args.docker:
4646
subprocess.check_call(['sudo', 'sed', '-i', 's/lxcbr0/br0/', '/etc/default/lxc-net'])
4747
print('Reboot is required')
4848
sys.exit(0)
@@ -176,7 +176,7 @@ def main():
176176
args = parser.parse_args()
177177
workdir = os.getcwd()
178178

179-
args.is_bionic = b'bionic' in subprocess.check_output(['lsb_release', '-cs'])
179+
args.is_focal = b'focal' in subprocess.check_output(['lsb_release', '-cs'])
180180

181181
if args.kvm and args.docker:
182182
raise Exception('Error: cannot have both kvm and docker')

contrib/gitian-descriptors/gitian-linux.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "bitcoin-core-linux-22"
33
enable_cache: true
44
distro: "ubuntu"
55
suites:
6-
- "bionic"
6+
- "focal"
77
architectures:
88
- "amd64"
99
packages:
@@ -15,6 +15,8 @@ packages:
1515
- "ca-certificates"
1616
- "curl"
1717
- "faketime"
18+
- "g++-8"
19+
- "gcc-8"
1820
- "git"
1921
- "libtool"
2022
- "patch"
@@ -107,7 +109,7 @@ script: |
107109
BASEPREFIX="${PWD}/depends"
108110
# Build dependencies for each host
109111
for i in $HOSTS; do
110-
make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
112+
make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}" CC=${i}-gcc-8 CXX=${i}-g++-8
111113
done
112114
113115
# Faketime for binaries
@@ -130,7 +132,7 @@ script: |
130132
# Extract the git archive into a dir for each host and build
131133
for i in ${HOSTS}; do
132134
export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
133-
if [ "${i}" = "riscv64-linux-gnu" ] || [ "${i}" = "powerpc64-linux-gnu" ] || [ "${i}" = "powerpc64le-linux-gnu" ]; then
135+
if [ "${i}" = "powerpc64-linux-gnu" ]; then
134136
# Workaround for https://bugs.launchpad.net/ubuntu/+source/gcc-8-cross-ports/+bug/1853740
135137
# TODO: remove this when no longer needed
136138
HOST_LDFLAGS="${HOST_LDFLAGS_BASE} -Wl,-z,noexecstack"
@@ -144,7 +146,7 @@ script: |
144146
tar --strip-components=1 -xf "${GIT_ARCHIVE}"
145147
146148
./autogen.sh
147-
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}"
149+
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" CC=${i}-gcc-8 CXX=${i}-g++-8
148150
make ${MAKEOPTS}
149151
make ${MAKEOPTS} -C src check-security
150152
make ${MAKEOPTS} -C src check-symbols

contrib/gitian-descriptors/gitian-osx-signer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: "bitcoin-dmg-signer"
33
distro: "ubuntu"
44
suites:
5-
- "bionic"
5+
- "focal"
66
architectures:
77
- "amd64"
88
packages:

contrib/gitian-descriptors/gitian-osx.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "bitcoin-core-osx-22"
33
enable_cache: true
44
distro: "ubuntu"
55
suites:
6-
- "bionic"
6+
- "focal"
77
architectures:
88
- "amd64"
99
packages:
@@ -29,6 +29,7 @@ packages:
2929
- "python3-setuptools"
3030
- "fonts-tuffy"
3131
- "xorriso"
32+
- "libtinfo5"
3233
remotes:
3334
- "url": "https://github.com/bitcoin/bitcoin.git"
3435
"dir": "bitcoin"

contrib/gitian-descriptors/gitian-win-signer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: "bitcoin-win-signer"
33
distro: "ubuntu"
44
suites:
5-
- "bionic"
5+
- "focal"
66
architectures:
77
- "amd64"
88
packages:

contrib/gitian-descriptors/gitian-win.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "bitcoin-core-win-22"
33
enable_cache: true
44
distro: "ubuntu"
55
suites:
6-
- "bionic"
6+
- "focal"
77
architectures:
88
- "amd64"
99
packages:

0 commit comments

Comments
 (0)