Revision fc6075dd

b/INSTALL
46 46
- `affinity Python module <http://pypi.python.org/pypi/affinity/0.1.0>`_,
47 47
  optional python package for supporting CPU pinning under KVM
48 48
- `ElementTree Python module <http://effbot.org/zone/element-index.htm>`_,
49
  if running python 2.4 (optional, used by the ``ovfconverter`` tool)
49
  if running on python 2.4 (optional, used by the ``ovfconverter`` tool)
50 50
- `qemu-img <http://qemu.org/>`_, if you want to use ``ovfconverter``
51 51
- `fping <http://fping.sourceforge.net/>`_
52 52

  
......
59 59
  $ apt-get install lvm2 ssh bridge-utils iproute iputils-arping \
60 60
                    ndisc6 python python-pyopenssl openssl \
61 61
                    python-pyparsing python-simplejson \
62
                    python-pyinotify python-pycurl socat \
63
                    python-elementtree qemu
62
                    python-pyinotify python-pycurl socat fping
63

  
64
Note that this does not install optional packages::
65

  
66
  $ apt-get install python-paramiko python-affinity qemu-img
67

  
68
If some of the python packages are not available in your system,
69
you can try installing them using ``easy_install`` command.
70
For example::
71

  
72
  $ apt-get install python-setuptools
73
  $ cd / && sudo easy_install \
74
            affinity
75

  
64 76

  
65 77
On Fedora to install all required packages except RBD, DRBD and Xen::
66 78

  
67 79
  $ yum install openssh openssh-clients bridge-utils iproute ndisc6 \
68 80
                pyOpenSSL pyparsing python-simplejson python-inotify \
69
                python-lxml python-paramiko socat qemu-img
81
                python-lxm socat fping
82

  
83
For optional packages use the command::
70 84

  
85
  $ yum install python-paramiko python-affinity qemu-img
71 86

  
72 87
If you want to build from source, please see doc/devnotes.rst for more
73 88
dependencies.
......
136 151
  $ apt-get install ghc libghc-json-dev libghc-network-dev \
137 152
                    libghc-parallel-dev libghc-curl-dev
138 153

  
139
If using a distribution which does not provide them, the first install
140
the Haskell platform and then install the additional libraries via
154
If using a distribution which does not provide them, first install
155
the Haskell platform. You can also install ``cabal`` manualy::
156

  
157
  $ apt-get install cabal-install
158

  
159
Then install the additional libraries via
141 160
``cabal``::
142 161

  
143 162
  $ cabal install json network parallel curl
......
171 190

  
172 191
to install them.
173 192

  
193
.. _cabal-note:
194
.. note::
195
  If one of the cabal packages fails to install due to unfulfilled
196
  dependencies, you can try enabling symlinks in ``~/.cabal/config``.
197

  
198
  Make sure that your ``~/.cabal/bin`` directory (or whatever else
199
  is defined as ``bindir``) is in your ``PATH``.
200

  
174 201
Installation of the software
175 202
----------------------------
176 203

  
b/doc/devnotes.rst
6 6
Build dependencies
7 7
------------------
8 8

  
9
Most dependencies from :doc:`install-quick`, plus (for Python):
9
Most dependencies from :doc:`install-quick`, including ``qemu-img``
10
(marked there as optional) plus (for Python):
10 11

  
11 12
- `GNU make <http://www.gnu.org/software/make/>`_
12 13
- `GNU tar <http://www.gnu.org/software/tar/>`_
13 14
- `Gzip <http://www.gnu.org/software/gzip/>`_
14 15
- `pandoc <http://johnmacfarlane.net/pandoc/>`_
16
- `python-epydoc <http://epydoc.sourceforge.net/>`_
15 17
- `python-sphinx <http://sphinx.pocoo.org/>`_
16
  (tested with version 0.6.1)
18
  (tested with version 1.1.3)
17 19
- `graphviz <http://www.graphviz.org/>`_
18 20
- the `en_US.UTF-8` locale must be enabled on the system
19 21
- `pylint <http://www.logilab.org/857>`_ and its associated
20 22
  dependencies
21 23
- `pep8 <https://github.com/jcrocholl/pep8/>`_
22 24

  
25
For older developement (Ganeti < 2.4) ``docbook`` was used instead
26
``pandoc``.
27

  
23 28
Note that for pylint, at the current moment the following versions
24 29
must be used::
25 30

  
......
27 32
    pylint 0.21.1,
28 33
    astng 0.20.1, common 0.50.3
29 34

  
35
The same with pep8, other versions may give you errors::
36

  
37
     $ pep8 --version
38
     0.6.1
39

  
30 40
To generate unittest coverage reports (``make coverage``), `coverage
31 41
<http://pypi.python.org/pypi/coverage>`_ needs to be installed.
32 42

  
43
Installation of all dependencies listed here::
44

  
45
     $ apt-get install python-setuptools
46
     $ apt-get install pandoc python-epydoc graphviz
47
     $ cd / && sudo easy_install \
48
               sphinx \
49
               logilab-astng==0.20.1 \
50
               logilab-common==0.50.3 \
51
               pylint==0.21.1 \
52
               pep8==0.6.1 \
53
               coverage
54

  
33 55
For Haskell development, again all things from the quick install
34 56
document, plus:
35 57

  

Also available in: Unified diff