Commit Graph

129 Commits

Author SHA1 Message Date
gdm85
1504c76f11 Fix issue #56: clean up environment before gbuild'ing
Originally proposed by cfields
2014-06-11 00:00:16 +02:00
Dev Random
e81f4145c2 Merge pull request #52 from laanwj/master
Un-hardcode host/guest IP
2014-04-09 12:42:43 -04:00
Wladimir J. van der Laan
4e90888bcf Make it possible to override bridge if for LXC
For example Ubuntu installs a bridge called `virbr0` by default for LXC.
Using this system-provided bridge avoids having to configure one
specifically before gitian building.

This commits makes it possible to override the bridge used by gitian
using the environment variable LXC_BRIDGE. The default is still to use
`br0` as before.
2014-04-04 09:56:25 +02:00
Wladimir J. van der Laan
5785dfc3ae Un-hardcode host/guest IP
I was running into trouble using gitian LXC INSIDE a VirtualBox VM, because
the 10.0.2.x IP range overlaps with the range that VirtualBox uses for
its internal NAT network.

This commit makes it possible to override the host and guest IP that
is used during LXC image creation and the build, using environment variables:

- `GITIAN_HOST_IP` (default=10.0.2.2, host IP from the viewpoint of the
   VM, can be used for both LXC and KVM)
- `LXC_GUEST_IP` (default=10.0.2.5, guest IP from the viewpoint of the
   host, effective for LXC only)

When these are not defined the behavior remains the same as before.
2014-04-02 16:24:52 +02:00
Dev Random
c9e62adc21 Merge pull request #50 from simondlr/increase_time
Increase time for checking if a target has started.
2014-04-01 11:14:14 -07:00
Dev Random
f0ec85e788 Merge pull request #51 from laanwj/master
Make it possible to override source URL
2014-04-01 08:57:45 -07:00
Wladimir J. van der Laan
534248d236 Make it possible to override source URL
To make test builds it can be useful to point gitian at an
alternative repository.

This commit makes this possible by adding a `--url PAIRS` command line
option, that allows to optionally specify where to fetch the code, for
example:

    gbuild --url bitcoin=https://github.com/laanwj/bitcoin.git --commit bitcoin=2014_03_...
2014-04-01 10:36:50 +02:00
Simon de la Rouviere
d8d01f7bad Increase time for checking if a target has started. 2014-02-11 17:18:30 +02:00
Dev Random
69de033bf4 Merge pull request #46 from tlrobinson/master
Add VirtualBox support to make-base-vm via Vagrant
2014-02-03 16:03:01 -08:00
devrandom
af10dad1fd Fix sanity checking in README 2014-02-03 10:27:02 -08:00
Tom Robinson
a6fdc28839 Add VirtualBox support to make-base-vm via Vagrant 2014-02-01 19:23:44 -08:00
devrandom
ac4f77bcd1 Initialize umask to a known value (002) 2013-12-04 14:16:44 -08:00
Dev Random
bdcbce6a0d Merge pull request #37 from TheBlueMatt/master
Fix bug + increase disk size
2013-10-31 19:25:59 -07:00
Matt Corallo
4e8ea08ee3 Fix gitian_updater checksum matching. 2013-10-31 21:35:51 -04:00
Matt Corallo
95e09ae608 Increase disk size for things like Firefox that need it. 2013-10-31 21:35:37 -04:00
devrandom
54f74f9c23 qemu-utils are required 2013-10-31 15:22:43 -07:00
devrandom
79c1217cb1 make passing env vars work across guest OS suites 2013-09-29 10:58:33 -07:00
devrandom
6919e04de1 use sudo even for root lxc so that path is set 2013-09-26 15:48:08 -07:00
devrandom
f7148de91b try again 2013-09-26 15:31:09 -07:00
devrandom
c47e51af72 second try 2013-09-26 14:55:26 -07:00
devrandom
af52ebf6cb use shell for lxc-start exec 2013-09-26 14:33:30 -07:00
devrandom
054a72167c update README some more 2013-09-24 11:25:56 -07:00
devrandom
84796af6ac make README.md Sanity Test section work as written 2013-09-24 11:18:27 -07:00
Dev Random
47ec544d6a Merge pull request #42 from mmlb/patch-1
Update the README.md file to work better with github.
2013-08-29 17:16:30 -07:00
Manuel Mendez
acc07d281b Update the README.md file to work better with github. 2013-08-29 11:16:56 -04:00
devrandom
6b0117e623 Complete license 2013-06-24 16:22:49 -07:00
devrandom
84fe4405c0 License file 2013-06-24 16:17:20 -07:00
Dev Random
6a76dccf97 Merge pull request #41 from arlolra/probably
Don't warn in if LXC.
2013-06-21 08:46:15 -07:00
Arlo Breault
d9cc3d14b9 Don't warn in if LXC. 2013-06-17 21:57:07 -07:00
Dev Random
4295ee2b47 Merge pull request #40 from wtogami/ontargetuserfix
Fix --user in --help to display how the command actually works
2013-06-09 18:23:44 -07:00
Warren Togami
e51dbdc9e3 Fix --user in --help to display how the command actually works 2013-06-03 01:14:27 -10:00
Dev Random
3c6379e89e Merge pull request #38 from laanwj/master
Increase ssh timeout to 30 seconds
2013-05-11 13:01:40 -07:00
Wladimir J. van der Laan
cdb3bb4d43 Increase ssh connection timeout to 30 seconds
The previous 5-second timeout causes random errors during compilation
here, increasing it to 30 seconds solves this problem.
2013-05-10 19:56:29 +02:00
Dev Random
5512bb3cec Merge pull request #35 from luke-jr/no_recommends
Don't install package recommends implicitly
2013-05-05 20:42:49 -07:00
Dev Random
41c3545e3b Merge pull request #34 from luke-jr/bugfix_noninteractive
Bugfix: Use noninteractive frontend for apt-get
2013-05-05 20:42:03 -07:00
Dev Random
6134fe03b9 Merge pull request #33 from luke-jr/bugfix_update_head_ok
Bugfix: Pass --update-head-ok to git fetch to avoid problems overwriting checked out branch
2013-05-05 20:41:23 -07:00
Luke Dashjr
f43ff49fa7 Don't install package recommends implicitly (require yml to specify them) 2013-04-18 06:35:07 +00:00
Luke Dashjr
ffe46ca40b Bugfix: Use noninteractive frontend for apt-get 2013-04-18 06:34:16 +00:00
Luke Dashjr
46b75df3d3 Bugfix: Pass --update-head-ok to git fetch to avoid problems overwriting checked out branch 2013-04-18 06:31:10 +00:00
Dev Random
2e9ffa0f54 Merge pull request #32 from sipa/enablekvm
Perhaps also actually enable KVM...
2013-04-15 19:04:21 -07:00
Pieter Wuille
9a198b32a7 Perhaps also actually enable KVM... 2013-04-15 01:22:22 +02:00
Dev Random
67c24197d2 Merge pull request #31 from sipa/qemusystem
Use qemu-system- instead of kvm -m
2013-04-13 16:02:51 -07:00
Pieter Wuille
b7b24bd401 Use qemu-system- instead of kvm -m
As kvm -m doesn't work in Ubuntu 13.04 anymore.
2013-04-14 00:55:07 +02:00
Dev Random
1f8299b9a0 Merge pull request #28 from luke-jr/custom_kvm
Allow environment-configurable KVM binary name
2013-04-10 10:55:12 -07:00
Dev Random
7e846db55e Merge pull request #29 from luke-jr/bugfix_changing_remote_uri
Bugfix: git fetch directly from the remote URL, rather than only setting a default the first time
2013-04-10 10:54:30 -07:00
Dev Random
72e4410d33 Merge pull request #30 from luke-jr/gentoo
Update README to include Gentoo instructions as well
2013-04-10 10:53:50 -07:00
Luke Dashjr
fa1de4aca0 Update README to include Gentoo instructions as well 2013-04-09 07:50:35 +00:00
Luke Dashjr
9512784622 Bugfix: git fetch directly from the remote URL, rather than only setting a default the first time
- Fixes problem where the gitian URL varies for different branches of the same repository
- Explicitly fetching tags using + allows repository to overwrite existing tags (changed tag)
- Fetching branch heads to local heads correctly makes branch names available for commit option
- Fetching both branches and tags at the same time optimizes things slightly
2013-04-09 07:33:43 +00:00
Luke Dashjr
54aeb2df27 Allow environment-configurable KVM binary name 2013-04-09 07:12:04 +00:00
Dev Random
11d8efec50 Merge pull request #27 from gavinandresen/virtualbox
Virtualbox support
2013-02-08 15:48:28 -08:00