Skip to content

Commit c1afe32

Browse files
ken2812221ken2812221
committed
Change gitian-descriptors to use bionic instead
1 parent c0f1569 commit c1afe32

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

‎contrib/gitian-build.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,13 @@ then
256256
if [[ -n "$USE_LXC" ]]
257257
then
258258
sudo apt-get install lxc
259-
bin/make-base-vm --suite trusty --arch amd64 --lxc
259+
bin/make-base-vm --suite bionic --arch amd64 --lxc
260260
elif [[ -n "$USE_DOCKER" ]]
261261
then
262262
sudo apt-get install docker-ce
263-
bin/make-base-vm --suite trusty --arch amd64 --docker
263+
bin/make-base-vm --suite bionic --arch amd64 --docker
264264
else
265-
bin/make-base-vm --suite trusty --arch amd64
265+
bin/make-base-vm --suite bionic --arch amd64
266266
fi
267267
popd
268268
fi

‎contrib/gitian-descriptors/gitian-linux.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
name: "bitcoin-linux-0.17"
33
enable_cache: true
44
suites:
5-
- "trusty"
5+
- "bionic"
66
architectures:
77
- "amd64"
88
packages:
99
- "curl"
1010
- "g++-aarch64-linux-gnu"
11-
- "g++-4.8-aarch64-linux-gnu"
12-
- "gcc-4.8-aarch64-linux-gnu"
11+
- "g++-7-aarch64-linux-gnu"
12+
- "gcc-7-aarch64-linux-gnu"
1313
- "binutils-aarch64-linux-gnu"
1414
- "g++-arm-linux-gnueabihf"
15-
- "g++-4.8-arm-linux-gnueabihf"
16-
- "gcc-4.8-arm-linux-gnueabihf"
15+
- "g++-7-arm-linux-gnueabihf"
16+
- "gcc-7-arm-linux-gnueabihf"
1717
- "binutils-arm-linux-gnueabihf"
18-
- "g++-4.8-multilib"
19-
- "gcc-4.8-multilib"
18+
- "g++-7-multilib"
19+
- "gcc-7-multilib"
2020
- "binutils-gold"
21-
- "git-core"
21+
- "git"
2222
- "pkg-config"
2323
- "autoconf"
2424
- "libtool"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: "bitcoin-dmg-signer"
33
suites:
4-
- "trusty"
4+
- "bionic"
55
architectures:
66
- "amd64"
77
packages:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
name: "bitcoin-osx-0.17"
33
enable_cache: true
44
suites:
5-
- "trusty"
5+
- "bionic"
66
architectures:
77
- "amd64"
88
packages:
99
- "ca-certificates"
1010
- "curl"
1111
- "g++"
12-
- "git-core"
12+
- "git"
1313
- "pkg-config"
1414
- "autoconf"
1515
- "librsvg2-bin"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: "bitcoin-win-signer"
33
suites:
4-
- "trusty"
4+
- "bionic"
55
architectures:
66
- "amd64"
77
packages:

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
name: "bitcoin-win-0.17"
33
enable_cache: true
44
suites:
5-
- "trusty"
5+
- "bionic"
66
architectures:
77
- "amd64"
88
packages:
99
- "curl"
1010
- "g++"
11-
- "git-core"
11+
- "git"
1212
- "pkg-config"
1313
- "autoconf"
1414
- "libtool"
@@ -21,6 +21,7 @@ packages:
2121
- "zip"
2222
- "ca-certificates"
2323
- "python"
24+
- "rename"
2425
remotes:
2526
- "url": "https://github.com/bitcoin/bitcoin.git"
2627
"dir": "bitcoin"
@@ -29,7 +30,7 @@ script: |
2930
WRAP_DIR=$HOME/wrapped
3031
HOSTS="i686-w64-mingw32 x86_64-w64-mingw32"
3132
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests"
32-
FAKETIME_HOST_PROGS="g++ ar ranlib nm windres strip objcopy"
33+
FAKETIME_HOST_PROGS="ar ranlib nm windres strip objcopy"
3334
FAKETIME_PROGS="date makensis zip"
3435
HOST_CFLAGS="-O2 -g"
3536
HOST_CXXFLAGS="-O2 -g"
@@ -84,7 +85,7 @@ script: |
8485
done
8586
for prog in gcc g++; do
8687
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
87-
echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
88+
echo "REAL=\`which -a ${i}-${prog}-posix | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
8889
echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
8990
echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
9091
echo "export COMPILER_PATH=${WRAP_DIR}/${i}" >> ${WRAP_DIR}/${i}-${prog}

0 commit comments

Comments
 (0)