diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -3,7 +3,7 @@ enable_cache: true distro: "debian" suites: -- "stretch" +- "buster" architectures: - "amd64" multiarch: @@ -28,7 +28,7 @@ - "bsdmainutils" - "ca-certificates" - "python" -- "lib32stdc++-6-dev" +- "lib32stdc++-8-dev" - "libc6-dev:i386" remotes: - "url": "https://github.com/Bitcoin-ABC/bitcoin-abc.git" diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml --- a/contrib/gitian-descriptors/gitian-osx-signer.yml +++ b/contrib/gitian-descriptors/gitian-osx-signer.yml @@ -2,7 +2,7 @@ name: "bitcoin-dmg-signer" distro: "debian" suites: -- "stretch" +- "buster" architectures: - "amd64" packages: diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -3,7 +3,7 @@ enable_cache: true distro: "debian" suites: -- "stretch" +- "buster" architectures: - "amd64" packages: @@ -25,6 +25,7 @@ - "libcap-dev" - "libz-dev" - "libbz2-dev" +- "libtinfo5" - "python" - "python-dev" - "python-setuptools" diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml --- a/contrib/gitian-descriptors/gitian-win-signer.yml +++ b/contrib/gitian-descriptors/gitian-win-signer.yml @@ -2,7 +2,7 @@ name: "bitcoin-win-signer" distro: "debian" suites: -- "stretch" +- "buster" architectures: - "amd64" packages: diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -3,7 +3,7 @@ enable_cache: true distro: "debian" suites: -- "stretch" +- "buster" architectures: - "amd64" packages: diff --git a/doc/gitian-building/gitian-building-create-vm-debian.md b/doc/gitian-building/gitian-building-create-vm-debian.md --- a/doc/gitian-building/gitian-building-create-vm-debian.md +++ b/doc/gitian-building/gitian-building-create-vm-debian.md @@ -60,12 +60,12 @@ - Click `Ok` twice to save. -Get the [Debian 9.x net installer](https://cdimage.debian.org/debian-cd/9.8.0/amd64/iso-cd/debian-9.8.0-amd64-netinst.iso) (a more recent minor version should also work, see also [Debian Network installation](https://www.debian.org/CD/netinst/)). +Get the [Debian 10.x net installer](https://cdimage.debian.org/debian-cd/10.1.0/amd64/iso-cd/debian-10.1.0-amd64-netinst.iso) (a more recent minor version should also work, see also [Debian Network installation](https://www.debian.org/CD/netinst/)). This DVD image can be [validated](https://www.debian.org/CD/verify) using a SHA256 hashing tool, for example on Unixy OSes by entering the following in a terminal: ```bash -echo "73bd56fb4548efa384bf32fd25808b99198f81c23cf19ab9e6507d898cd58dce debian-9.8.0-amd64-netinst.iso" | sha256sum -c +echo "7915fdb77a0c2623b4481fc5f0a8052330defe1cde1e0834ff233818dc6f301e debian-10.1.0-amd64-netinst.iso" | sha256sum -c # (must return OK) ``` diff --git a/doc/gitian-building/gitian-building-manual.md b/doc/gitian-building/gitian-building-manual.md --- a/doc/gitian-building/gitian-building-manual.md +++ b/doc/gitian-building/gitian-building-manual.md @@ -84,15 +84,15 @@ export PATH="$PATH":${HOME}/gitian-builder/libexec export USE_LXC=1 cd ~/gitian-builder -./libexec/make-clean-vm --suite stretch --arch amd64 +./libexec/make-clean-vm --suite buster --arch amd64 -LXC_ARCH=amd64 LXC_SUITE=stretch on-target -u root dpkg --add-architecture i386 -LXC_ARCH=amd64 LXC_SUITE=stretch on-target -u root apt-get update -LXC_ARCH=amd64 LXC_SUITE=stretch on-target -u root \ +LXC_ARCH=amd64 LXC_SUITE=buster on-target -u root dpkg --add-architecture i386 +LXC_ARCH=amd64 LXC_SUITE=buster on-target -u root apt-get update +LXC_ARCH=amd64 LXC_SUITE=buster on-target -u root \ -e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install \ $( sed -ne '/^packages:/,/^[^-]/ {/^- .*/{s/"//g;s/- //;p}}' ../bitcoin-abc/contrib/gitian-descriptors/*|sort|uniq ) -LXC_ARCH=amd64 LXC_SUITE=stretch on-target -u root apt-get -q -y purge grub -LXC_ARCH=amd64 LXC_SUITE=stretch on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade +LXC_ARCH=amd64 LXC_SUITE=buster on-target -u root apt-get -q -y purge grub +LXC_ARCH=amd64 LXC_SUITE=buster on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade ``` And then set offline mode for apt-cacher-ng: @@ -109,8 +109,8 @@ Then when building, override the remote URLs that gbuild would otherwise pull from the Gitian descriptors:: ```bash cd ~ -BTCPATH=${HOME}/bitcoin-abc -COMMIT= +export URL=${HOME}/bitcoin-abc +export COMMIT= -./bin/gbuild --commit bitcoin=${COMMIT} --url bitcoin=${BTCPATH} ${BTCPATH}/contrib/gitian-descriptors/gitian-win-signer.yml +./bin/gbuild --commit bitcoin=${COMMIT} --url bitcoin=${URL} ${URL}/contrib/gitian-descriptors/gitian-win.yml ``` diff --git a/doc/gitian-building/gitian-building-setup-gitian-debian.md b/doc/gitian-building/gitian-building-setup-gitian-debian.md --- a/doc/gitian-building/gitian-building-setup-gitian-debian.md +++ b/doc/gitian-building/gitian-building-setup-gitian-debian.md @@ -90,8 +90,7 @@ --------------------------- Gitian needs a virtual image of the operating system to build in. -Currently this is Ubuntu Bionic x86_64, however previous releases were built -with Ubuntu Trusty x86_64. +Currently this is Debian 10 Buster x86_64. This image will be copied and used every time that a build is started to make sure that the build is deterministic. Creating the image will take a while, but only has to be done once. @@ -100,7 +99,7 @@ ```bash cd gitian-builder -bin/make-base-vm --lxc --arch amd64 --distro debian --suite stretch +bin/make-base-vm --lxc --arch amd64 --distro debian --suite buster ``` There will be a lot of warnings printed during the build of the image. These can be ignored. diff --git a/doc/gitian-building/gitian-building-setup-gitian-fedora.md b/doc/gitian-building/gitian-building-setup-gitian-fedora.md --- a/doc/gitian-building/gitian-building-setup-gitian-fedora.md +++ b/doc/gitian-building/gitian-building-setup-gitian-fedora.md @@ -56,8 +56,7 @@ ------------------------- Gitian needs a virtual image of the operating system to build in. -Currently this is Ubuntu Bionic x86_64, however previous releases were built -with Ubuntu Trusty x86_64. +Currently this is Debian 10 Buster x86_64. This image will be copied and used every time that a build is started to make sure that the build is deterministic. Creating the image will take a while, but only has to be done once. @@ -66,8 +65,7 @@ ```bash cd gitian-builder -bin/make-base-vm --docker --arch amd64 --suite bionic # For releases after and including 0.17.0 -bin/make-base-vm --docker --arch amd64 --suite trusty # For releases before 0.17.0 +bin/make-base-vm --docker --arch amd64 --suite buster ``` **Note**: When sudo asks for a password, enter the password for the user `gitianuser` not for `root`. diff --git a/doc/gitian-building/gitian-building-vargant.md b/doc/gitian-building/gitian-building-vagrant.md rename from doc/gitian-building/gitian-building-vargant.md rename to doc/gitian-building/gitian-building-vagrant.md --- a/doc/gitian-building/gitian-building-vargant.md +++ b/doc/gitian-building/gitian-building-vagrant.md @@ -53,7 +53,7 @@ --------------------------- Gitian needs a virtual image of the operating system to build in. Currently -this is Debian Stretch x86_64. This image will be copied and used every time +this is Debian Buster x86_64. This image will be copied and used every time that a build is started to make sure that the build is deterministic. Creating the image will take a while, but only has to be done once. @@ -61,7 +61,7 @@ ```bash cd gitian-builder -./bin/make-base-vm --lxc --distro debian --suite stretch --arch amd64 +./bin/make-base-vm --lxc --distro debian --suite buster --arch amd64 ``` There will be a lot of warnings printed during the build of the image. These