Author: krejzi
Date: Mon Feb 17 18:24:31 2014
New Revision: 10478
Log:
Random fixes.
Modified:
branches/systemd/BOOK/chapter05/xz.xml
branches/systemd/BOOK/chapter06/acl.xml
branches/systemd/BOOK/chapter06/attr.xml
branches/systemd/BOOK/chapter06/createfiles.xml
branches/systemd/BOOK/chapter06/dbus.xml
branches/systemd/BOOK/chapter06/expat.xml
branches/systemd/BOOK/chapter06/findutils.xml
branches/systemd/BOOK/chapter06/flex.xml
branches/systemd/BOOK/chapter06/gdbm.xml
branches/systemd/BOOK/chapter06/gettext.xml
branches/systemd/BOOK/chapter06/glibc.xml
branches/systemd/BOOK/chapter06/gperf.xml
branches/systemd/BOOK/chapter06/intltool.xml
branches/systemd/BOOK/chapter06/libcap.xml
branches/systemd/BOOK/chapter06/mpfr.xml
branches/systemd/BOOK/chapter06/systemd.xml
branches/systemd/BOOK/chapter06/xz.xml
Modified: branches/systemd/BOOK/chapter05/xz.xml
==============================================================================
--- branches/systemd/BOOK/chapter05/xz.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter05/xz.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -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>
Modified: branches/systemd/BOOK/chapter06/acl.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/acl.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter06/acl.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -47,23 +47,23 @@
<screen><userinput remap="pre">sed -i -e 's|/@pkg_name@|&-@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
- with ACL support. To anyways test the results, issue:</para>
-
-<screen><userinput remap="test">make -k tests root-tests</userinput></screen>
+ controls. Coreutils needs to be compiled with ACL support in order for
+ the testsuite to complete sucessfully. To test the results, issue:</para>
- <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>
+<screen><userinput remap="test">make tests</userinput></screen>
<para>Install the package:</para>
@@ -76,7 +76,7 @@
<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 @@
<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 @@
</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>
Modified: branches/systemd/BOOK/chapter06/attr.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/attr.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter06/attr.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -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 -k tests root-tests</userinput></screen>
+<screen><userinput remap="test">make tests root-tests</userinput></screen>
<para>Install the package:</para>
@@ -76,7 +75,7 @@
<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 @@
<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 @@
</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>
Modified: branches/systemd/BOOK/chapter06/createfiles.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/createfiles.xml Mon Feb 17 09:40:52
2014 (r10477)
+++ branches/systemd/BOOK/chapter06/createfiles.xml Mon Feb 17 18:24:31
2014 (r10478)
@@ -66,7 +66,6 @@
<screen><userinput>cat > /etc/passwd << "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 @@
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 @@
messagebus:x:18:
systemd-journal:x:23:
mail:x:34:
-nogroup:x:99:
-users:x:100:</literal>
+nogroup:x:99:</literal>
EOF</userinput></screen>
<para>The created groups are not part of any standard—they are groups
Modified: branches/systemd/BOOK/chapter06/dbus.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/dbus.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter06/dbus.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -48,15 +48,11 @@
<para>Prepare D-Bus for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/dbus-1.0 \
- --disable-static \
- --enable-systemd \
+<screen><userinput remap="configure">./configure --prefix=/usr
\
+ --sysconfdir=/etc \
+ --localstatedir=/var \
--docdir=/usr/share/doc/dbus-&dbus-version; \
- --with-console-auth-dir=/run/console/ \
-
--with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+ --with-console-auth-dir=/run/console/</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 @@
<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 @@
</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>
Modified: branches/systemd/BOOK/chapter06/expat.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/expat.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter06/expat.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -74,7 +74,7 @@
<seglistitem>
<seg>xmlwf</seg>
- <seg>libexpat.{so,a}</seg>
+ <seg>libexpat.{a,so}</seg>
<seg>/usr/share/doc/expat-&expat-version;</seg>
</seglistitem>
</segmentedlist>
Modified: branches/systemd/BOOK/chapter06/findutils.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/findutils.xml Mon Feb 17 09:40:52
2014 (r10477)
+++ branches/systemd/BOOK/chapter06/findutils.xml Mon Feb 17 18:24:31
2014 (r10478)
@@ -45,8 +45,7 @@
<para>Prepare Findutils for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr
\
- --localstatedir=/var/lib/locate</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr
--localstatedir=/var/lib/locate</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
Modified: branches/systemd/BOOK/chapter06/flex.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/flex.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter06/flex.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -47,8 +47,7 @@
<para>Prepare Flex for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr \
- --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr
--docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
<para>Compile the package:</para>
@@ -97,7 +96,7 @@
<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 @@
</listitem>
</varlistentry>
- <varlistentry id="libfl.so">
- <term><filename class="libraryfile">libfl.so</filename></term>
+ <varlistentry id="libfl">
+ <term><filename class="libraryfile">libfl</filename></term>
<listitem>
<para>The <filename class="libraryfile">flex</filename>
library</para>
- <indexterm zone="ch-system-flex libfl.so">
- <primary sortas="c-libfl.so">libfl.so</primary>
+ <indexterm zone="ch-system-flex libfl">
+ <primary sortas="c-libfl">libfl</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/BOOK/chapter06/gdbm.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/gdbm.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter06/gdbm.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -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>
Modified: branches/systemd/BOOK/chapter06/gettext.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/gettext.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter06/gettext.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -45,8 +45,7 @@
<para>Prepare Gettext for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr \
-
--docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr
--docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
<para>Compile the package:</para>
Modified: branches/systemd/BOOK/chapter06/glibc.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/glibc.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter06/glibc.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -81,9 +81,9 @@
<para>Prepare Glibc for compilation:</para>
<screen><userinput remap="configure">../glibc-&glibc-version;/configure
\
- --prefix=/usr \
- --disable-profile \
- --enable-kernel=&min-kernel; \
+ --prefix=/usr \
+ --disable-profile \
+ --enable-kernel=&min-kernel; \
--enable-obsolete-rpc</userinput></screen>
<variablelist>
@@ -183,7 +183,7 @@
<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
Modified: branches/systemd/BOOK/chapter06/gperf.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/gperf.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter06/gperf.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -42,8 +42,7 @@
<para>Prepare Gperf for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr \
- --docdir=/usr/share/doc/gperf-&gperf-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr
--docdir=/usr/share/doc/gperf-&gperf-version;</userinput></screen>
<para>Compile the package:</para>
Modified: branches/systemd/BOOK/chapter06/intltool.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/intltool.xml Mon Feb 17 09:40:52
2014 (r10477)
+++ branches/systemd/BOOK/chapter06/intltool.xml Mon Feb 17 18:24:31
2014 (r10478)
@@ -56,8 +56,7 @@
<para>Install the package:</para>
<screen><userinput remap="install">make install
-install -v -Dm644 doc/I18N-HOWTO \
-
/usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
+install -v -Dm644 doc/I18N-HOWTO
/usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
</sect2>
Modified: branches/systemd/BOOK/chapter06/libcap.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/libcap.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter06/libcap.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -60,7 +60,7 @@
<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 @@
<seglistitem>
<seg>capsh, getcap, getpcaps, and setcap</seg>
- <seg>libcap.{so,a}</seg>
+ <seg>libcap.{a,so}</seg>
</seglistitem>
</segmentedlist>
@@ -113,7 +113,7 @@
</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">
Modified: branches/systemd/BOOK/chapter06/mpfr.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/mpfr.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter06/mpfr.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -43,9 +43,9 @@
<para>Prepare MPFR for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr \
- --enable-thread-safe \
- --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr \
+ --enable-thread-safe \
+ --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
<para>Compile the package:</para>
Modified: branches/systemd/BOOK/chapter06/systemd.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/systemd.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter06/systemd.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -57,16 +57,15 @@
<para>Prepare Systemd for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib \
+<screen><userinput remap="configure">./configure --prefix=/usr
\
+ --sysconfdir=/etc \
+ --localstatedir=/var \
--docdir=/usr/share/doc/systemd-&systemd-version; \
- --config-cache \
- --with-rootprefix= \
- --with-rootlibdir=/lib \
- --enable-split-usr \
- --disable-gudev \
+ --config-cache \
+ --with-rootprefix= \
+ --with-rootlibdir=/lib \
+ --enable-split-usr \
+ --disable-gudev \
--without-python</userinput></screen>
<variablelist>
@@ -116,6 +115,14 @@
<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>
Modified: branches/systemd/BOOK/chapter06/xz.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/xz.xml Mon Feb 17 09:40:52 2014
(r10477)
+++ branches/systemd/BOOK/chapter06/xz.xml Mon Feb 17 18:24:31 2014
(r10478)
@@ -46,8 +46,7 @@
<para>Prepare Xz for compilation with:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr \
- --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr
--docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
<para>Compile the package:</para>
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
