Browse Source

Merge #7060: build: Make networking work inside LXC builder in gitian-building.md

3b468a0 gitian: Need `ca-certificates` and `python` for LXC builds (Wladimir J. van der Laan)
99fda26 doc: Make networking work inside builder in gitian-building.md (Wladimir J. van der Laan)
0.13
Wladimir J. van der Laan 9 years ago
parent
commit
53fa09f04d
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      contrib/gitian-descriptors/gitian-linux.yml
  2. 2
      contrib/gitian-descriptors/gitian-osx.yml
  3. 2
      contrib/gitian-descriptors/gitian-win.yml
  4. 6
      doc/gitian-building.md

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

@ -15,6 +15,8 @@ packages:
- "faketime" - "faketime"
- "bsdmainutils" - "bsdmainutils"
- "binutils-gold" - "binutils-gold"
- "ca-certificates"
- "python"
reference_datetime: "2016-01-01 00:00:00" reference_datetime: "2016-01-01 00:00:00"
remotes: remotes:
- "url": "https://github.com/bitcoin/bitcoin.git" - "url": "https://github.com/bitcoin/bitcoin.git"

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

@ -18,6 +18,8 @@ packages:
- "libcap-dev" - "libcap-dev"
- "libz-dev" - "libz-dev"
- "libbz2-dev" - "libbz2-dev"
- "ca-certificates"
- "python"
reference_datetime: "2016-01-01 00:00:00" reference_datetime: "2016-01-01 00:00:00"
remotes: remotes:
- "url": "https://github.com/bitcoin/bitcoin.git" - "url": "https://github.com/bitcoin/bitcoin.git"

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

@ -18,6 +18,8 @@ packages:
- "g++-mingw-w64" - "g++-mingw-w64"
- "nsis" - "nsis"
- "zip" - "zip"
- "ca-certificates"
- "python"
reference_datetime: "2016-01-01 00:00:00" reference_datetime: "2016-01-01 00:00:00"
remotes: remotes:
- "url": "https://github.com/bitcoin/bitcoin.git" - "url": "https://github.com/bitcoin/bitcoin.git"

6
doc/gitian-building.md

@ -259,15 +259,15 @@ adduser debian sudo
Then set up LXC and the rest with the following, which is a complex jumble of settings and workarounds: Then set up LXC and the rest with the following, which is a complex jumble of settings and workarounds:
```bash ```bash
# the version of lxc-start in Debian 7.4 needs to run as root, so make sure # the version of lxc-start in Debian needs to run as root, so make sure
# that the build script can execute it without providing a password # that the build script can execute it without providing a password
echo "%sudo ALL=NOPASSWD: /usr/bin/lxc-start" > /etc/sudoers.d/gitian-lxc echo "%sudo ALL=NOPASSWD: /usr/bin/lxc-start" > /etc/sudoers.d/gitian-lxc
# add cgroup for LXC
echo "cgroup /sys/fs/cgroup cgroup defaults 0 0" >> /etc/fstab
# make /etc/rc.local script that sets up bridge between guest and host # make /etc/rc.local script that sets up bridge between guest and host
echo '#!/bin/sh -e' > /etc/rc.local echo '#!/bin/sh -e' > /etc/rc.local
echo 'brctl addbr br0' >> /etc/rc.local echo 'brctl addbr br0' >> /etc/rc.local
echo 'ifconfig br0 10.0.3.2/24 up' >> /etc/rc.local echo 'ifconfig br0 10.0.3.2/24 up' >> /etc/rc.local
echo 'iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE' >> /etc/rc.local
echo 'echo 1 > /proc/sys/net/ipv4/ip_forward' >> /etc/rc.local
echo 'exit 0' >> /etc/rc.local echo 'exit 0' >> /etc/rc.local
# make sure that USE_LXC is always set when logging in as debian, # make sure that USE_LXC is always set when logging in as debian,
# and configure LXC IP addresses # and configure LXC IP addresses

Loading…
Cancel
Save