From 0a59df251c87f6b6f49284948510a4abc13e22c7 Mon Sep 17 00:00:00 2001 From: Krejzi Date: Sat, 18 May 2013 13:22:18 +0000 Subject: [PATCH] Unmerge XML::Parser from Perl page as discussed. Add Libdbus page which installs D-Bus library to satisfy circular dependency between Systemd and D-Bus. git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10281 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter06/chapter06.xml | 4 +- chapter06/dbus.xml | 14 +++++- chapter06/libdbus.xml | 102 +++++++++++++++++++++++++++++++++++++++ chapter06/perl.xml | 27 ----------- chapter06/xml-parser.xml | 96 ++++++++++++++++++++++++++++++++++++ packages.ent | 2 + 6 files changed, 215 insertions(+), 30 deletions(-) create mode 100644 chapter06/libdbus.xml create mode 100644 chapter06/xml-parser.xml diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 7f3f5a601..c0dfd87e3 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -52,6 +52,7 @@ + @@ -74,8 +75,9 @@ - + + diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml index b38ad86d5..bb0ea73f4 100644 --- a/chapter06/dbus.xml +++ b/chapter06/dbus.xml @@ -52,6 +52,8 @@ --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/dbus-1.0 \ + --disable-static \ + --enable-systemd \ --docdir=/usr/share/doc/dbus-&dbus-version; \ --with-console-auth-dir=/run/console/ \ --with-systemdsystemunitdir=/lib/systemd/system @@ -59,6 +61,14 @@ The meaning of the configure options: + + --enable-systemd + + This enables support for authentication check using + Systemd Logind. + + + --with-console-auth-dir=/run/console @@ -98,7 +108,7 @@ dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor, dbus-send and dbus-uuidgen - libdbus-1.{so,a} + libdbus-1.so /etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0, /usr/share/dbus-1, /usr/share/doc/dbus-&dbus-version; and /var/lib/dbus @@ -172,7 +182,7 @@ - libdbus.{so,a} + libdbus-1.so Contains API functions used to communicate with the D-Bus message bus. diff --git a/chapter06/libdbus.xml b/chapter06/libdbus.xml new file mode 100644 index 000000000..ba3916d12 --- /dev/null +++ b/chapter06/libdbus.xml @@ -0,0 +1,102 @@ + + + %general-entities; +]> + + + + + + libdbus + &dbus-version; +
&dbus-url;
+
+ + Libdbus-&dbus-version; + + + Libdbus + + + + + + <para>Libdbus package provides a library to communicate with + D-Bus messagebus daemon. It is only installed to satisfy + circular dependency between Systemd and D-Bus.</para> + + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> + + <seglistitem> + <seg>&dbus-ch6-sbu;</seg> + <seg>&dbus-ch6-du;</seg> + </seglistitem> + </segmentedlist> + + </sect2> + + <sect2 role="installation"> + <title>Installation of Libdbus + + Prepare Libdbus for compilation: + +./configure --prefix=/usr --disable-static + + Compile the package: + +make -C dbus libdbus-1.la + + This package does come with a testsuite, but it is not + possible to run it because only part of the package is + installed. + + Install the package: + +make -C dbus lib_LTLIBRARIES=libdbus-1.la \ + install-libLTLIBRARIES \ + install-dbusincludeHEADERS \ + install-nodist_dbusarchincludeHEADERS +make install-pkgconfigDATA + + + + + Contents of Libdbus + + + Installed programs + Installed libraries + Installed directories + + + none + libdbus-1.so + /usr/include/dbus-1.0 and /usr/lib/dbus-1.0 + + + + + Short Descriptions + + + + + libdbus-1.so + + Contains API functions used to communicate with the D-Bus + message bus. + + libdbus + + + + + + + + +
diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 955509b04..24f99adf0 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -117,33 +117,6 @@ Install the package: -make install - - - - - Installation of XML::Parser - - Extract the XML::Parser tarball and change to the extracted - directory: - -tar xf ../XML-Parser-&xml-parser-version;.tar.gz -cd XML-Parser-&xml-parser-version; - - Prepare XML::Parser for compilation: - -perl Makefile.PL - - Compile the package: - -make - - To test the results, issue: - -make test - - Install the package: - make install diff --git a/chapter06/xml-parser.xml b/chapter06/xml-parser.xml new file mode 100644 index 000000000..08155ecdf --- /dev/null +++ b/chapter06/xml-parser.xml @@ -0,0 +1,96 @@ + + + %general-entities; +]> + + + + + + xml-parser + &xml-parser-version; +
&xml-parser-url;
+
+ + XML::Parser-&xml-parser-version; + + + XML::Parser + + + + + + <para>The XML::Parser module is a Perl interface to James Clark's + XML parser, Expat.</para> + + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> + + <seglistitem> + <seg>&xml-parser-ch6-sbu;</seg> + <seg>&xml-parser-ch6-du;</seg> + </seglistitem> + </segmentedlist> + + </sect2> + + <sect2 role="installation"> + <title>Installation of XML::Parser + + Prepare XML::Parser for compilation: + +perl Makefile.PL + + Compile the package: + +make + + To test the results, issue: + +make test + + Install the package: + +make install + + + + + Contents of XML::Parser + + + Installed programs + Installed libraries + Installed directories + + + none + Expat.so + none + + + + + Short Descriptions + + + + + Expat.so + + provides the Perl Expat interface. + + Expat + + + + + + + + +
diff --git a/packages.ent b/packages.ent index 795960d9c..0d01b9ffa 100644 --- a/packages.ent +++ b/packages.ent @@ -616,6 +616,8 @@ + +