Skip to content

Commit

Permalink
Update gitian build base to jammy (#326)
Browse files Browse the repository at this point in the history
* Update gitian build base to jammy

* Update python package in linux

* Update g++ packages

* Update multilib version

* Remove multilib

* Update gitian-builder repository

* Remove 32-bit environment

* Add bison

* Remove comment lines

* Update python package
  • Loading branch information
azuchi authored Dec 26, 2024
1 parent cf9ba27 commit dc07f93
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions contrib/gitian-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ def setup():
# if not os.path.isdir('bitcoin-detached-sigs'):
# subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin-core/bitcoin-detached-sigs.git'])
if not os.path.isdir('gitian-builder'):
subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
subprocess.check_call(['git', 'clone', 'https://github.com/chaintope/gitian-builder.git'])
if not os.path.isdir('tapyrus-core'):
subprocess.check_call(['git', 'clone', 'https://github.com/chaintope/tapyrus-core.git'])
os.chdir('gitian-builder')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
make_image_prog = ['bin/make-base-vm', '--suite', 'jammy', '--arch', 'amd64']
if args.docker:
make_image_prog += ['--docker']
elif not args.kvm:
make_image_prog += ['--lxc']
subprocess.check_call(make_image_prog)
os.chdir(workdir)
if args.is_bionic and not args.kvm and not args.docker:
if args.is_jammy and not args.kvm and not args.docker:
subprocess.check_call(['sudo', 'sed', '-i', 's/lxcbr0/br0/', '/etc/default/lxc-net'])
print('Reboot is required')
sys.exit(0)
Expand Down Expand Up @@ -176,7 +176,7 @@ def main():
args = parser.parse_args()
workdir = os.getcwd()

args.is_bionic = b'bionic' in subprocess.check_output(['lsb_release', '-cs'])
args.is_jammy = b'jammy' in subprocess.check_output(['lsb_release', '-cs'])

if args.kvm and args.docker:
raise Exception('Error: cannot have both kvm and docker')
Expand Down
18 changes: 9 additions & 9 deletions contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@
name: "tapyrus-core-linux-0.6"
enable_cache: true
suites:
- "bionic"
- "jammy"
architectures:
- "amd64"
packages:
- "curl"
- "g++-aarch64-linux-gnu"
- "g++-7-aarch64-linux-gnu"
- "gcc-7-aarch64-linux-gnu"
- "g++-9-aarch64-linux-gnu"
- "gcc-9-aarch64-linux-gnu"
- "binutils-aarch64-linux-gnu"
- "g++-arm-linux-gnueabihf"
- "g++-7-arm-linux-gnueabihf"
- "gcc-7-arm-linux-gnueabihf"
- "g++-arm-linux-gnueabihf"
- "g++-9-arm-linux-gnueabihf"
- "gcc-9-arm-linux-gnueabihf"
- "binutils-arm-linux-gnueabihf"
- "g++-7-multilib"
- "gcc-7-multilib"
- "binutils-gold"
- "git"
- "pkg-config"
Expand All @@ -26,15 +25,16 @@ packages:
- "faketime"
- "bsdmainutils"
- "ca-certificates"
- "python"
- "python3-zmq"
- "bison"
remotes:
- "url": "https://github.com/chaintope/tapyrus-core"
"dir": "tapyrus-core"
files: []
script: |
WRAP_DIR=$HOME/wrapped
HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu"
HOSTS="x86_64-linux-gnu aarch64-linux-gnu"
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests"
FAKETIME_HOST_PROGS=""
FAKETIME_PROGS="date ar ranlib nm"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-osx-signer.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: "tapyrus-core-dmg-signer"
suites:
- "bionic"
- "jammy"
architectures:
- "amd64"
packages:
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: "tapyrus-core-osx-0.6"
enable_cache: true
suites:
- "bionic"
- "jammy"
architectures:
- "amd64"
packages:
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-win-signer.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: "tapyrus-core-win-signer"
suites:
- "bionic"
- "jammy"
architectures:
- "amd64"
packages:
Expand Down
4 changes: 2 additions & 2 deletions contrib/gitian-descriptors/gitian-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: "tapyrus-core-win-0.6"
enable_cache: true
suites:
- "bionic"
- "jammy"
architectures:
- "amd64"
packages:
Expand All @@ -20,7 +20,7 @@ packages:
- "nsis"
- "zip"
- "ca-certificates"
- "python"
- "python3"
- "rename"
remotes:
- "url": "https://github.com/chaintope/tapyrus-core"
Expand Down
2 changes: 1 addition & 1 deletion doc/build-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Below are some notes on how to build Tapyrus Core for Windows.

The options known to work for building Tapyrus Core on Windows are:

* On Linux using the [Mingw-w64](https://mingw-w64.org/doku.php) cross compiler tool chain. Ubuntu Bionic 18.04 is required
* On Linux using the [Mingw-w64](https://mingw-w64.org/doku.php) cross compiler tool chain. Ubuntu Jammy 22.04 is required
and is the platform used to build the Tapyrus Core Windows release binaries.
* On Windows using [Windows
Subsystem for Linux (WSL)](https://msdn.microsoft.com/commandline/wsl/about) and the Mingw-w64 cross compiler tool chain.
Expand Down

0 comments on commit dc07f93

Please sign in to comment.