Skip to content

Commit 27e2d8b

Browse files
committed
Finished /Contrib Index. Standardized READMEs.
File and Link Fix.
1 parent dd9bd86 commit 27e2d8b

File tree

17 files changed

+102
-49
lines changed

17 files changed

+102
-49
lines changed

contrib/README.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Contrib Index
22
---------------------
33

4+
### [BitRPC](/contrib/bitrpc) ###
5+
Added bitrpc.py which allows for sending of all standard Bitcoin commands via RPC rather than as command line args.
6+
47
### [Debian](/contrib/debian) ###
58
Contains files used to package bitcoind/bitcoin-qt
69
for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here.
@@ -11,7 +14,10 @@ Gavin's notes on getting gitian builds up and running using KVM.
1114
### [Gitian-downloader](/contrib/gitian-downloader)
1215
Various PGP files of core developers.
1316

14-
### [Macdeploy](/contrib/macdeploy) ###
17+
### [Linearize](/contrib/linearize) ###
18+
Construct a linear, no-fork, best version of the blockchain.
19+
20+
### [MacDeploy](/contrib/macdeploy) ###
1521
Scripts and notes for Mac builds.
1622

1723
### [PyMiner](/contrib/pyminer) ###
@@ -31,4 +37,14 @@ Use the raw transactions API to send coins received on a particular
3137
address (or addresses).
3238

3339
### [TestGen](/contrib/testgen) ###
34-
Utilities to generate test vectors for the data-driven Bitcoin tests.
40+
Utilities to generate test vectors for the data-driven Bitcoin tests.
41+
42+
### [Test Patches](/contrib/test-patches) ###
43+
These patches are applied when the automated pull-tester
44+
tests each pull and when master is tested using jenkins.
45+
46+
### [Verify SF Binaries](/contrib/verifysfbinaries) ###
47+
This script attempts to download and verify the signature file SHA256SUMS.asc from SourceForge.
48+
49+
### [Wallet Tools](/contrib/wallettools) ###
50+
Contains a wallet change password and unlock script.

contrib/bitrpc/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
### BitRPC ###
2+
Allows for sending of all standard Bitcoin commands via RPC rather than as command line args.

contrib/gitian-descriptors/README renamed to contrib/gitian-descriptors/README.md

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
Gavin's notes on getting gitian builds up and running using KVM:
1+
### Gavin's notes on getting gitian builds up and running using KVM:###
22

33
These instructions distilled from:
4-
https://help.ubuntu.com/community/KVM/Installation
4+
[ https://help.ubuntu.com/community/KVM/Installation]( https://help.ubuntu.com/community/KVM/Installation)
55
... see there for complete details.
66

77
You need the right hardware: you need a 64-bit-capable CPU with hardware virtualization support (Intel VT-x or AMD-V). Not all modern CPUs support hardware virtualization.
88

99
You probably need to enable hardware virtualization in your machine's BIOS.
1010

1111
You need to be running a recent version of 64-bit-Ubuntu, and you need to install several prerequisites:
12-
sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm
12+
13+
sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm
1314

1415
Sanity checks:
15-
sudo service apt-cacher-ng status # Should return apt-cacher-ng is running
16-
ls -l /dev/kvm # Should show a /dev/kvm device
16+
17+
sudo service apt-cacher-ng status # Should return apt-cacher-ng is running
18+
ls -l /dev/kvm # Should show a /dev/kvm device
1719

1820

1921
Once you've got the right hardware and software:
@@ -22,10 +24,12 @@ Once you've got the right hardware and software:
2224
git clone git://github.com/devrandom/gitian-builder.git
2325
mkdir gitian-builder/inputs
2426
cd gitian-builder/inputs
27+
2528
# Inputs for Linux and Win32:
2629
wget -O miniupnpc-1.6.tar.gz 'http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-1.6.tar.gz'
2730
wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2'
28-
# Inputs for Win32: (Linux has packages for these)
31+
32+
# Inputs for Win32: (Linux has packages for these)
2933
wget 'https://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2'
3034
wget 'http://www.openssl.org/source/openssl-1.0.1c.tar.gz'
3135
wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
@@ -58,31 +62,29 @@ Once you've got the right hardware and software:
5862

5963
---------------------
6064

61-
gitian-builder now also supports building using LXC. See
62-
https://help.ubuntu.com/12.04/serverguide/lxc.html
65+
`gitian-builder` now also supports building using LXC. See
66+
[ https://help.ubuntu.com/12.04/serverguide/lxc.html]( https://help.ubuntu.com/12.04/serverguide/lxc.html)
6367
... for how to get LXC up and running under Ubuntu.
6468

6569
If your main machine is a 64-bit Mac or PC with a few gigabytes of memory
66-
and at least 10 gigabytes of free disk space, you can gitian-build using
70+
and at least 10 gigabytes of free disk space, you can `gitian-build` using
6771
LXC running inside a virtual machine.
6872

6973
Here's a description of Gavin's setup on OSX 10.6:
7074

71-
1. Download and install VirtualBox from https://www.virtualbox.org/
75+
1. Download and install VirtualBox from [https://www.virtualbox.org/](https://www.virtualbox.org/)
7276

7377
2. Download the 64-bit Ubuntu Desktop 12.04 LTS .iso CD image from
74-
http://www.ubuntu.com/
78+
[http://www.ubuntu.com/](http://www.ubuntu.com/)
7579

76-
3. Run VirtualBox and create a new virtual machine, using the
77-
Ubuntu .iso (see the VirtualBox documentation for details).
78-
Create it with at least 2 gigabytes of memory and a disk
79-
that is at least 20 gigabytes big.
80+
3. Run VirtualBox and create a new virtual machine, using the Ubuntu .iso (see the [VirtualBox documentation](https://www.virtualbox.org/wiki/Documentation) for details). Create it with at least 2 gigabytes of memory and a disk that is at least 20 gigabytes big.
8081

8182
4. Inside the running Ubuntu desktop, install:
82-
sudo apt-get install debootstrap lxc ruby apache2 git apt-cacher-ng python-vm-builder
8383

84-
5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right
85-
hardware and software" instructions above:
86-
export USE_LXC=1
87-
git clone git://github.com/bitcoin/bitcoin.git
88-
... etc
84+
sudo apt-get install debootstrap lxc ruby apache2 git apt-cacher-ng python-vm-builder
85+
86+
5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right hardware and software" instructions above:
87+
88+
export USE_LXC=1
89+
git clone git://github.com/bitcoin/bitcoin.git
90+
... etc

contrib/linearize/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
### Linearize ###
2+
Construct a linear, no-fork, best version of the blockchain.
File renamed without changes.

contrib/macdeploy/README.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
### MacDeploy ###
2+
3+
You will need the appscript package for the fancy disk image creation to work:
4+
5+
sudo easy_install appscript
6+
7+
For Snow Leopard (which uses [Python 2.6](http://www.python.org/download/releases/2.6/)), you will need the param_parser package:
8+
9+
sudo easy_install argparse
10+
11+
This script should not be run manually, instead, after building as usual:
12+
13+
make deploy
14+
15+
During the process, the disk image window will pop up briefly where the fancy
16+
settings are applied. This is normal, please do not interfere.
17+
18+
When finished, it will produce `Bitcoin-Qt.dmg`.
19+

contrib/macdeploy/notes.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.

contrib/pyminer/README renamed to contrib/pyminer/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
### PyMiner ###
12

2-
This is a 'getwork' CPU mining client for bitcoin.
3+
This is a 'getwork' CPU mining client for Bitcoin.
34

45
It is pure-python, and therefore very, very slow. The purpose is to
56
provide a reference implementation of a miner, for study.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
### Qos ###
2+
13
This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 8333, but not if the destination IP is within a LAN (defined as 192.168.x.x).
24

35
This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it.

0 commit comments

Comments
 (0)