X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=README;h=d8b1b1296a74f7abd5f2106a771420c2a7281c94;hb=954449b82df7fc2d37a8d854977a1a73a65edfbd;hp=bcb4371cc285a9dd21ff437470c52347d97761ea;hpb=b603662c4152f9bbff3d93d69df0a4f4e05762c7;p=elogind.git

diff --git a/README b/README
index bcb4371cc..d8b1b1296 100644
--- a/README
+++ b/README
@@ -40,8 +40,8 @@ REQUIREMENTS:
                 optional but strongly recommended: autofs4, ipv6
         dbus >= 1.4.0
         libcap
-        libblkid >= 2.20 (from util-linux)
-        libkmod >= 5
+        libblkid >= 2.20 (from util-linux) (optional)
+        libkmod >= 5 (optional)
         PAM >= 1.1.2 (optional)
         libcryptsetup (optional)
         libaudit (optional)
@@ -53,8 +53,24 @@ REQUIREMENTS:
         libgcrypt (optional)
         libqrencode (optional)
         libmicrohttpd (optional)
+        libpython (optional)
+        make, gcc, and similar tools
+
+        During runtime you need the following additional dependencies:
+
+        util-linux >= v2.19 (requires fsck -l, agetty -s)
+        sulogin (from util-linux >= 2.22 or sysvinit-tools, optional but recommended)
+        dracut (optional)
+        PolicyKit (optional)
 
-        When you build from git you need the following additional dependencies:
+        For systmed-bootchart a kernel with procfs support and several
+        proc output options enabled is required:
+
+        CONFIG_PROC_FS
+        CONFIG_SCHEDSTATS
+        CONFIG_SCHED_DEBUG
+
+        When building from git you need the following additional dependencies:
 
         docbook-xsl
         xsltproc
@@ -65,27 +81,25 @@ REQUIREMENTS:
         gperf
         gtkdocize (optional)
         python (optional)
-        make, gcc, and similar tools
-
-        During runtime you need the following dependencies:
-
-        util-linux > v2.18 (requires fsck -l, agetty -s)
-        sulogin (from sysvinit-tools, optional but recommended)
-        dracut (optional)
+        sphinx (optional)
 
         When systemd-hostnamed is used it is strongly recommended to
         install nss-myhostname to ensure that in a world of
         dynamically changing hostnames the hostname stays resolvable
         under all circumstances. In fact, systemd-hostnamed will warn
-        if nss-myhostname is not installed. Packagers are encouraged to
-        add a dependency on nss-myhostname to the package that
-        includes systemd-hostnamed.
+        if nss-myhostname is not installed.
 
         Note that D-Bus can link against libsystemd-login.so, which
         results in a cyclic build dependency. To accommodate for this
         please build D-Bus without systemd first, then build systemd,
         then rebuild D-Bus with systemd support.
 
+        To build HTML documentation for python-systemd using sphinx,
+        please first install systemd (using 'make install'), and then
+        invoke sphinx-build with 'make sphinx-<target>', with <target>
+        being 'html' or 'latexpdf'. If using DESTDIR for installation,
+        pass the same DESTDIR to 'make sphinx-html' invocation.
+
 WARNINGS:
         systemd will warn you during boot if /etc/mtab is not a
         symlink to /proc/mounts. Please ensure that /etc/mtab is a
@@ -109,13 +123,3 @@ WARNINGS:
         (e.g. ./configure CPPFLAGS='... -DVALGRIND=1'). Otherwise,
         false positives will be triggered by code which violates
         some rules but is actually safe.
-
-ENGINEERING AND CONSULTING SERVICES:
-        ProFUSION <http://profusion.mobi> offers professional
-        engineering and consulting services for systemd for embedded
-        and other use. Please contact Gustavo Barbieri
-        <barbieri@profusion.mobi> for more information.
-
-        Disclaimer: This notice is not a recommendation or official
-        endorsement. However, ProFUSION's upstream work has been very
-        beneficial for the systemd project.