Random fixes.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10478 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter05/xz.xml

@@ -41,7 +41,7 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Xz-Utils</title>
+    <title>Installation of Xz</title>
 
     <para>Prepare Xz for compilation:</para>
 

chapter06/acl.xml

@@ -47,23 +47,23 @@
 
 <screen><userinput remap="pre">sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
 
+    <para>Fix some broken tests:</para>
+
+<screen><userinput remap="pre">sed -i "s:| sed.*::g" test/{sbits-restore,cp,misc}.test</userinput></screen>
+
     <para>Prepare Acl for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
 
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
 
     <para>The Acl tests need to be run on a filesystem that supports access
-    controls. You will see lot of failures because Coreutils wasn't compiled
+    controls. Coreutils needs to be compiled with ACL support in order for
-    with ACL support. To anyways test the results, issue:</para>
+    the testsuite to complete sucessfully. To test the results, issue:</para>
 
-<screen><userinput remap="test">make -k tests root-tests</userinput></screen>
+<screen><userinput remap="test">make tests</userinput></screen>
-
-    <note><para>Even if you run Acl tests after Coreutils has been built with
-    Acl support, at least 11 tests will still fail for unknown reasons.</para>
-    </note>
 
     <para>Install the package:</para>
 
@@ -76,7 +76,7 @@ chmod -v 755 /usr/lib/libacl.so</userinput></screen>
     <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
 
 <screen><userinput remap="install">mv -v /usr/lib/libacl.so.* /lib
-ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so</userinput></screen>
+ln -sfv ../../lib/$(readlink /usr/lib/libacl.so) /usr/lib/libacl.so</userinput></screen>
 
   </sect2>
 
@@ -90,7 +90,7 @@ ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so</userinput></screen>
 
       <seglistitem>
         <seg>chacl, getfacl, and setacl</seg>
-        <seg>libacl.{so,a}</seg>
+        <seg>libacl.{a,so}</seg>
         <seg>/usr/include/acl, /usr/share/doc/acl-&acl-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -132,11 +132,11 @@ ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libacl">
-        <term><filename class="libraryfile">libacl.{so,a}</filename></term>
+        <term><filename class="libraryfile">libacl</filename></term>
         <listitem>
           <para>Contains the <application>Acl</application> API functions.</para>
           <indexterm zone="ch-system-acl libacl">
-            <primary sortas="c-libacl">libacl.{so,a}</primary>
+            <primary sortas="c-libacl">libacl</primary>
           </indexterm>
         </listitem>
       </varlistentry>

chapter06/attr.xml

@@ -62,8 +62,7 @@
     <para>The Attr tests need to be run on a filesystem that supports extended
     attributes. To test the results, issue:</para>
 
-<!-- ext-tests fail for some reason -->
+<screen><userinput remap="test">make tests root-tests</userinput></screen>
-<screen><userinput remap="test">make -k tests root-tests</userinput></screen>
 
     <para>Install the package:</para>
 
@@ -76,7 +75,7 @@ chmod -v 755 /usr/lib/libattr.so</userinput></screen>
     <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
 
 <screen><userinput remap="install">mv -v /usr/lib/libattr.so.* /lib
-ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so</userinput></screen>
+ln -sfv ../../lib/$(readlink /usr/lib/libattr.so) /usr/lib/libattr.so</userinput></screen>
 
   </sect2>
 
@@ -90,7 +89,7 @@ ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so</userinput></screen>
 
       <seglistitem>
         <seg>attr, getfattr, and setattr</seg>
-        <seg>libattr.{so,a}</seg>
+        <seg>libattr.{a,so}</seg>
         <seg>/usr/include/attr, /usr/share/doc/attr-&attr-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -131,11 +130,11 @@ ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libattr">
-        <term><filename class="libraryfile">libattr.{so,a}</filename></term>
+        <term><filename class="libraryfile">libattr</filename></term>
         <listitem>
           <para>Contains the <application>Attr</application> API functions.</para>
           <indexterm zone="ch-system-attr libattr">
-            <primary sortas="c-libattr">libattr.{so,a}</primary>
+            <primary sortas="c-libattr">libattr</primary>
           </indexterm>
         </listitem>
       </varlistentry>

chapter06/createfiles.xml

@@ -66,7 +66,6 @@ ln -sv bash /bin/sh</userinput></screen>
 <screen><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
 <literal>root:x:0:0:root:/root:/bin/bash
 bin:x:1:1:bin:/dev/null:/bin/false
-daemon:x:6:6:daemon:/dev/null:/bin/false
 messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false
 nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
@@ -84,7 +83,6 @@ sys:x:2:
 kmem:x:3:
 tape:x:4:
 tty:x:5:
-daemon:x:6:
 floppy:x:7:
 disk:x:8:
 lp:x:9:
@@ -98,8 +96,7 @@ adm:x:16:
 messagebus:x:18:
 systemd-journal:x:23:
 mail:x:34:
-nogroup:x:99:
+nogroup:x:99:</literal>
-users:x:100:</literal>
 EOF</userinput></screen>
 
   <para>The created groups are not part of any standard&mdash;they are groups

chapter06/dbus.xml

@@ -48,15 +48,11 @@
 
     <para>Prepare D-Bus for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr \
+<screen><userinput remap="configure">./configure --prefix=/usr                      \
-            --sysconfdir=/etc \
+            --sysconfdir=/etc                  \
-            --localstatedir=/var \
+            --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-console-auth-dir=/run/console/</userinput></screen>
-            --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -84,7 +80,9 @@
 <screen><userinput remap="make">make</userinput></screen>
 
     <para>This package does come with a testsuite, but it requires several
-    packages that are not included in LFS.</para>
+    packages that are not included in LFS. Instructions for running the
+    testsuite can be found in the BLFS book at
+    <ulink url="&blfs-root;/view/svn/general/dbus.html"/>.</para>
 
     <para>Install the package:</para>
 
@@ -116,7 +114,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
       <seglistitem>
         <seg>dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor,
         dbus-send, and dbus-uuidgen</seg>
-        <seg>libdbus-1.so</seg>
+        <seg>libdbus-1.{a,so}</seg>
         <seg>/etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0,
         /usr/share/dbus-1, /usr/share/doc/dbus-&dbus-version;,
         /var/lib/dbus</seg>
@@ -190,7 +188,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
       </varlistentry>
 
       <varlistentry id="libdbus">
-        <term><filename class="libraryfile">libdbus-1.so</filename></term>
+        <term><filename class="libraryfile">libdbus-1</filename></term>
         <listitem>
           <para>Contains API functions used to communicate with the D-Bus
           message bus.</para>

chapter06/expat.xml

@@ -74,7 +74,7 @@ install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</user
 
       <seglistitem>
         <seg>xmlwf</seg>
-        <seg>libexpat.{so,a}</seg>
+        <seg>libexpat.{a,so}</seg>
         <seg>/usr/share/doc/expat-&expat-version;</seg>
       </seglistitem>
     </segmentedlist>

chapter06/findutils.xml

@@ -45,8 +45,7 @@
 
     <para>Prepare Findutils for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                   \
+<screen><userinput remap="configure">./configure --prefix=/usr --localstatedir=/var/lib/locate</userinput></screen>
-            --localstatedir=/var/lib/locate</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

chapter06/flex.xml

@@ -47,8 +47,7 @@
 
     <para>Prepare Flex for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr \
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
-            --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -97,7 +96,7 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
 
       <seglistitem>
         <seg>flex, flex++ (link to flex), and lex</seg>
-        <seg>libfl.{so,a} and libfl_pic.{so.a}</seg>
+        <seg>libfl.{a,so} and libfl_pic.{a,so}</seg>
         <seg>/usr/share/doc/flex-&flex-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -141,12 +140,12 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libfl.so">
+      <varlistentry id="libfl">
-        <term><filename class="libraryfile">libfl.so</filename></term>
+        <term><filename class="libraryfile">libfl</filename></term>
         <listitem>
           <para>The <filename class="libraryfile">flex</filename> library</para>
-          <indexterm zone="ch-system-flex libfl.so">
+          <indexterm zone="ch-system-flex libfl">
-            <primary sortas="c-libfl.so">libfl.so</primary>
+            <primary sortas="c-libfl">libfl</primary>
           </indexterm>
         </listitem>
       </varlistentry>

chapter06/gdbm.xml

@@ -83,7 +83,7 @@
 
       <seglistitem>
         <seg>testgdbm</seg>
-        <seg>libgdbm.{so,a} and libgdbm_compat.{so,a}</seg>
+        <seg>libgdbm.{a,so} and libgdbm_compat.{a,so}</seg>
       </seglistitem>
     </segmentedlist>
 

chapter06/gettext.xml

@@ -45,8 +45,7 @@
 
     <para>Prepare Gettext for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr \
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
-            --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
     <para>Compile the package:</para>
 

chapter06/glibc.xml

@@ -81,9 +81,9 @@ cd ../glibc-build</userinput></screen>
     <para>Prepare Glibc for compilation:</para>
 
 <screen><userinput remap="configure">../glibc-&glibc-version;/configure          \
-    --prefix=/usr                \
+    --prefix=/usr          \
-    --disable-profile            \
+    --disable-profile      \
-    --enable-kernel=&min-kernel;       \
+    --enable-kernel=&min-kernel; \
     --enable-obsolete-rpc</userinput></screen>
 
     <variablelist>
@@ -183,7 +183,7 @@ mkdir -pv /var/cache/nscd</userinput></screen>
 
     <para>Install the Systemd support files for <command>nscd</command>:</para>
 
-<screen><userinput remap="install">install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.tmpfiles /etc/tmpfiles.d/nscd.conf
+<screen><userinput remap="install">install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.tmpfiles /usr/lib/tmpfiles.d/nscd.conf
 install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.service /lib/systemd/system/nscd.service</userinput></screen>
 
     <para>The locales that can make the system respond in a different language

chapter06/gperf.xml

@@ -42,8 +42,7 @@
 
     <para>Prepare Gperf for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr \
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/gperf-&gperf-version;</userinput></screen>
-            --docdir=/usr/share/doc/gperf-&gperf-version;</userinput></screen>
 
     <para>Compile the package:</para>
 

chapter06/intltool.xml

@@ -56,8 +56,7 @@
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install
-install -v -Dm644 doc/I18N-HOWTO \
+install -v -Dm644 doc/I18N-HOWTO /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
-        /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
 
   </sect2>
 

chapter06/libcap.xml

@@ -60,7 +60,7 @@ chmod -v 755 /usr/lib/libcap.so</userinput></screen>
     <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
 
 <screen><userinput remap="install">mv -v /usr/lib/libcap.so.* /lib
-ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput></screen>
+ln -sfv ../../lib/$(readlink /usr/lib/libcap.so) /usr/lib/libcap.so</userinput></screen>
 
   </sect2>
 
@@ -73,7 +73,7 @@ ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput></screen>
 
       <seglistitem>
         <seg>capsh, getcap, getpcaps, and setcap</seg>
-        <seg>libcap.{so,a}</seg>
+        <seg>libcap.{a,so}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -113,7 +113,7 @@ ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libcap">
-        <term><filename class="libraryfile">libcap.{so,a}</filename></term>
+        <term><filename class="libraryfile">libcap</filename></term>
         <listitem>
           <para>Contains the libcap API functions</para>
           <indexterm zone="ch-system-libcap libcap">

chapter06/mpfr.xml

@@ -43,9 +43,9 @@
 
     <para>Prepare MPFR for compilation:</para>
 
-<screen><userinput remap="configure">./configure  --prefix=/usr        \
+<screen><userinput remap="configure">./configure --prefix=/usr        \
-             --enable-thread-safe \
+            --enable-thread-safe \
-             --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
+            --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <para>Compile the package:</para>
 

chapter06/systemd.xml

@@ -57,16 +57,15 @@ EOF</userinput></screen>
 
     <para>Prepare Systemd for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr \
+<screen><userinput remap="configure">./configure --prefix=/usr                       \
-            --sysconfdir=/etc \
+            --sysconfdir=/etc                   \
-            --localstatedir=/var \
+            --localstatedir=/var                \
-            --libexecdir=/usr/lib \
             --docdir=/usr/share/doc/systemd-&systemd-version; \
-            --config-cache \
+            --config-cache                      \
-            --with-rootprefix= \
+            --with-rootprefix=                  \
-            --with-rootlibdir=/lib \
+            --with-rootlibdir=/lib              \
-            --enable-split-usr \
+            --enable-split-usr                  \
-            --disable-gudev \
+            --disable-gudev                     \
             --without-python</userinput></screen>
 
     <variablelist>
@@ -116,6 +115,14 @@ EOF</userinput></screen>
     <para>The package comes with a testsuite, but it doesn't work in
     chroot. It needs to be run from a system booted using Systemd.</para>
 
+    <para>First prevent a broken test case from running:</para>
+
+<screen><userinput remap="test">sed -i s:test/udev-test.pl::g Makefile</userinput></screen>
+
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>

chapter06/xz.xml

@@ -46,8 +46,7 @@
 
     <para>Prepare Xz for compilation with:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr \
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
-            --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <para>Compile the package:</para>