diff --git a/Getting-Started-with-MMGen.md b/Getting-Started-with-MMGen.md index 8120c32..c34bda7 100644 --- a/Getting-Started-with-MMGen.md +++ b/Getting-Started-with-MMGen.md @@ -104,11 +104,11 @@ make *all* commands use testnet. With testnet you can safely practice all the operations below, including the offline ones, on an online computer. **Regtest mode** is a more convenient alternative to testnet that requires no -Internet connection. In regtest mode, bitcoind creates a private blockchain on -which you can mine, send and receive transactions. MMGen commands support -regtest mode with the `--regtest=1` option or the `regtest` option in -`mmgen.cfg`. The following is a brief guide to get you started with regtest -mode: +Internet connection and no blockchain sync time. In regtest mode, bitcoind +creates a private blockchain on which you can mine, send and receive +transactions. MMGen commands support regtest mode with the `--regtest=1` option +or the `regtest` option in `mmgen.cfg`. The following is a brief guide to get +you started with regtest mode: Start the bitcoin daemon, generate 432 blocks to activate Segwit on the regtest chain and stop: @@ -162,7 +162,7 @@ require a wallet or other seed source.* *You may not want this feature if you plan to store your MMGen wallet in a location other than your MMGen data directory. Otherwise, it’s recommended, -as it frees you from having to type your wallet file on the command line.* +as it frees you from having to type your wallet filename on the command line.* *The following examples suppose that you’ve chosen to use a default wallet. If you haven't, then you must include the path to a wallet file or other seed diff --git a/Home.md b/Home.md index 61155a9..d3eaa3f 100644 --- a/Home.md +++ b/Home.md @@ -2,7 +2,7 @@ > #### [Install on Microsoft Windows](Install-MMGen-on-Microsoft-Windows) -> #### [Install on Debian/Ubuntu Linux](Install-MMGen-on-Debian-or-Ubuntu-Linux) +> #### [Install on Debian, Ubuntu, Raspbian or Armbian Linux](Install-MMGen-on-Debian-or-Ubuntu-Linux) ### Using MMGen diff --git a/Install-Bitcoind-from-Source-on-Debian-or-Ubuntu-Linux.md b/Install-Bitcoind-from-Source-on-Debian-or-Ubuntu-Linux.md index f80ece8..c8d1a6c 100644 --- a/Install-Bitcoind-from-Source-on-Debian-or-Ubuntu-Linux.md +++ b/Install-Bitcoind-from-Source-on-Debian-or-Ubuntu-Linux.md @@ -2,40 +2,34 @@ Make sure that the following development packages for the boost library are installed (package names may vary; the version should be 1.48 or greater, and version 1.54 on Ubuntu 13.10 is reported not to work): - libboost-system-dev - libboost-filesystem-dev - libboost-program-options-dev - libboost-chrono-dev - libboost-test-dev - libboost-thread-dev + sudo apt-get install libboost-system-dev libboost-filesystem-dev libboost-program-options-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev -You'll also need the standard build tools if they're not already on your system: - - sudo apt-get install build-essential libtool autotools-dev autoconf pkg-config libssl-dev +You'll also need some standard dependencies if they're not already on your system: + sudo apt-get install build-essential libtool autotools-dev autoconf pkg-config libssl-dev libdb-dev libdb++-dev libevent-dev Clone the bitcoin repository from Github, configure, and build: $ git clone https://github.com/bitcoin/bitcoin.git $ cd bitcoin $ ./autogen.sh - $ ./configure --without-gui + $ ./configure --without-gui --with-incompatible-bdb $ make -j4 -If 'configure' complains about a missing libdb version 4.8, you have two -options: either install the libdb4.8-dev and libdb4.8++-dev packages (you may -have to obtain them from elsewhere) or install your distribution's current -libdbX.X-dev and libdbX.X++-dev packages and add the '--with-incompatible-bdb' -option to the 'configure' command line. Be warned that the latter option will -result in your 'wallet.dat' files being incompatible with the prebuilt binary -version of bitcoind. +The '-j4' option will speed the build process up by using 4 cores of a 4-core +processor, if you have them. If overheating issues are a problem for your CPU +or you're short on memory, you may want to omit it or use '-j2'. Due to lack of +memory, the build will probably fail on a Raspberry PI or similar hardware, +even with optimization turned off. -For more detailed information on this and other dependency issues, consult the -file 'doc/build-unix.md' in the bitcoin source repository. +For more detailed build information, consult the file [doc/build-unix.md][bu] +in the bitcoin source repository. -Your freshly compiled daemon is now in the src/ directory. Refer to **Run:** on -the [binary installation page][01] for running instructions. +Your freshly compiled bitcoind daemon is now in the src/ directory. Refer to +**Run:** on the [binary installation page][01] for instructions on running +bitcoind. [01]: Install-Bitcoind [dl]: https://bitcoin.org/en/download [gs]: Getting-Started-with-MMGen +[bu]: https://github.com/bitcoin/bitcoin/blob/master/doc/build-unix.md diff --git a/Install-MMGen-on-Debian-or-Ubuntu-Linux.md b/Install-MMGen-on-Debian-or-Ubuntu-Linux.md index cf4d32c..998e6e9 100644 --- a/Install-MMGen-on-Debian-or-Ubuntu-Linux.md +++ b/Install-MMGen-on-Debian-or-Ubuntu-Linux.md @@ -27,14 +27,6 @@ Install MMGen: $ sudo ./setup.py install $ cd .. -Install vanitygen (optional): - - $ sudo apt-get install libpcre3-dev - $ git clone https://github.com/samr7/vanitygen.git - $ cd vanitygen; make - (copy the "keyconv" executable to your execution path) - $ cd .. - Install bitcoind: > To install prebuilt binaries, click [here][01]. To install from source,