Author: krejzi
Date: Tue Feb 18 13:28:59 2014
New Revision: 10483
Log:
Updates from LFS development.
Modified:
branches/systemd/BOOK/chapter01/changelog.xml
branches/systemd/BOOK/chapter05/binutils-pass1.xml
branches/systemd/BOOK/chapter05/binutils-pass2.xml
branches/systemd/BOOK/chapter05/expect.xml
branches/systemd/BOOK/chapter05/gcc-pass2.xml
branches/systemd/BOOK/chapter05/libstdc++.xml
branches/systemd/BOOK/chapter05/stripping.xml
branches/systemd/BOOK/chapter05/xz.xml
branches/systemd/BOOK/chapter06/creatingdirs.xml
branches/systemd/BOOK/chapter06/db.xml
branches/systemd/BOOK/chapter06/gcc.xml
branches/systemd/BOOK/chapter06/glibc.xml
branches/systemd/BOOK/chapter06/kmod.xml
branches/systemd/BOOK/chapter06/pcre.xml
branches/systemd/BOOK/chapter06/procps.xml
branches/systemd/BOOK/chapter06/readline.xml
branches/systemd/BOOK/chapter06/shadow.xml
branches/systemd/BOOK/chapter06/strippingagain.xml
branches/systemd/BOOK/chapter06/util-linux.xml
branches/systemd/BOOK/chapter06/xz.xml
branches/systemd/BOOK/general.ent
Modified: branches/systemd/BOOK/chapter01/changelog.xml
==============================================================================
--- branches/systemd/BOOK/chapter01/changelog.xml Tue Feb 18 10:46:43
2014 (r10482)
+++ branches/systemd/BOOK/chapter01/changelog.xml Tue Feb 18 13:28:59
2014 (r10483)
@@ -36,6 +36,17 @@
</listitem>
-->
<listitem>
+ <para>2014-02-18</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Change kmod instructions to allow
+ installation of man pages. Fixes
+ <ulink url="&lfs-ticket-root;3502">#3502</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2014-02-17</para>
<itemizedlist>
<listitem>
Modified: branches/systemd/BOOK/chapter05/binutils-pass1.xml
==============================================================================
--- branches/systemd/BOOK/chapter05/binutils-pass1.xml Tue Feb 18 10:46:43
2014 (r10482)
+++ branches/systemd/BOOK/chapter05/binutils-pass1.xml Tue Feb 18 13:28:59
2014 (r10483)
@@ -72,7 +72,7 @@
<para>Now prepare Binutils for compilation:</para>
-<screen><userinput remap="configure">../binutils-&binutils-version;/configure
\
+<screen><userinput remap="configure">../binutils-&binutils-version;/configure
\
--prefix=/tools \
--with-sysroot=$LFS \
--with-lib-path=/tools/lib \
Modified: branches/systemd/BOOK/chapter05/binutils-pass2.xml
==============================================================================
--- branches/systemd/BOOK/chapter05/binutils-pass2.xml Tue Feb 18 10:46:43
2014 (r10482)
+++ branches/systemd/BOOK/chapter05/binutils-pass2.xml Tue Feb 18 13:28:59
2014 (r10483)
@@ -53,7 +53,7 @@
<screen><userinput remap="configure">CC=$LFS_TGT-gcc \
AR=$LFS_TGT-ar \
RANLIB=$LFS_TGT-ranlib \
-../binutils-&binutils-version;/configure \
+../binutils-&binutils-version;/configure \
--prefix=/tools \
--disable-nls \
--with-lib-path=/tools/lib \
Modified: branches/systemd/BOOK/chapter05/expect.xml
==============================================================================
--- branches/systemd/BOOK/chapter05/expect.xml Tue Feb 18 10:46:43 2014
(r10482)
+++ branches/systemd/BOOK/chapter05/expect.xml Tue Feb 18 13:28:59 2014
(r10483)
@@ -51,8 +51,9 @@
<para>Now prepare Expect for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/tools
--with-tcl=/tools/lib \
- --with-tclinclude=/tools/include</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools \
+ --with-tcl=/tools/lib \
+ --with-tclinclude=/tools/include</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
Modified: branches/systemd/BOOK/chapter05/gcc-pass2.xml
==============================================================================
--- branches/systemd/BOOK/chapter05/gcc-pass2.xml Tue Feb 18 10:46:43
2014 (r10482)
+++ branches/systemd/BOOK/chapter05/gcc-pass2.xml Tue Feb 18 13:28:59
2014 (r10483)
@@ -77,7 +77,7 @@
do
cp -uv $file{,.orig}
sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&@g' \
- -e 's@/usr@/tools@g' $file.orig > $file
+ -e 's@/usr@/tools@g' $file.orig > $file
echo '
#undef STANDARD_STARTFILE_PREFIX_1
#undef STANDARD_STARTFILE_PREFIX_2
Modified: branches/systemd/BOOK/chapter05/libstdc++.xml
==============================================================================
--- branches/systemd/BOOK/chapter05/libstdc++.xml Tue Feb 18 10:46:43
2014 (r10482)
+++ branches/systemd/BOOK/chapter05/libstdc++.xml Tue Feb 18 13:28:59
2014 (r10483)
@@ -56,13 +56,13 @@
<para>Prepare Libstdc++ for compilation:</para>
<screen><userinput
remap="configure">../gcc-&gcc-version;/libstdc++-v3/configure \
- --host=$LFS_TGT \
- --prefix=/tools \
- --disable-multilib \
- --disable-shared \
- --disable-nls \
- --disable-libstdcxx-threads \
- --disable-libstdcxx-pch \
+ --host=$LFS_TGT \
+ --prefix=/tools \
+ --disable-multilib \
+ --disable-shared \
+ --disable-nls \
+ --disable-libstdcxx-threads \
+ --disable-libstdcxx-pch \
--with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</userinput></screen>
<variablelist>
Modified: branches/systemd/BOOK/chapter05/stripping.xml
==============================================================================
--- branches/systemd/BOOK/chapter05/stripping.xml Tue Feb 18 10:46:43
2014 (r10482)
+++ branches/systemd/BOOK/chapter05/stripping.xml Tue Feb 18 13:28:59
2014 (r10483)
@@ -16,10 +16,11 @@
debugging symbols. Remove those symbols with:</para>
<screen><userinput>strip --strip-debug /tools/lib/*
-strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
+/usr/bin/strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
<para>These commands will skip a number of files, reporting that it does not
- recognize their file format. Most of these are scripts instead of
binaries.</para>
+ recognize their file format. Most of these are scripts instead of binaries.
+ Also use the system strip command to include the strip binary in
/tools.</para>
<para>Take care <emphasis>not</emphasis> to use
<parameter>--strip-unneeded</parameter> on the libraries. The static
Modified: branches/systemd/BOOK/chapter05/xz.xml
==============================================================================
--- branches/systemd/BOOK/chapter05/xz.xml Tue Feb 18 10:46:43 2014
(r10482)
+++ branches/systemd/BOOK/chapter05/xz.xml Tue Feb 18 13:28:59 2014
(r10483)
@@ -6,10 +6,10 @@
]>
<sect1 id="ch-tools-xz" role="wrap">
- <?dbhtml filename="xz-utils.html"?>
+ <?dbhtml filename="xz.html"?>
<sect1info condition="script">
- <productname>xz-utils</productname>
+ <productname>xz</productname>
<productnumber>&xz-version;</productnumber>
<address>&xz-url;</address>
</sect1info>
Modified: branches/systemd/BOOK/chapter06/creatingdirs.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/creatingdirs.xml Tue Feb 18 10:46:43
2014 (r10482)
+++ branches/systemd/BOOK/chapter06/creatingdirs.xml Tue Feb 18 13:28:59
2014 (r10483)
@@ -22,9 +22,13 @@
mkdir -v /usr/{,local/}share/{misc,terminfo,zoneinfo}
mkdir -v /usr/libexec
mkdir -pv /usr/{,local/}share/man/man{1..8}
+
case $(uname -m) in
- x86_64) ln -sv lib /lib64 && ln -sv lib /usr/lib64 && ln -sv
lib /usr/local/lib64 ;;
+ x86_64) ln -sv lib /lib64 &&
+ ln -sv lib /usr/lib64 &&
+ ln -sv lib /usr/local/lib64 ;;
esac
+
mkdir -v /var/{log,mail,spool}
ln -sv /run /var/run
ln -sv /run/lock /var/lock
Modified: branches/systemd/BOOK/chapter06/db.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/db.xml Tue Feb 18 10:46:43 2014
(r10482)
+++ branches/systemd/BOOK/chapter06/db.xml Tue Feb 18 13:28:59 2014
(r10483)
@@ -273,7 +273,7 @@
<varlistentry id="libdb">
- <term><filename class="libraryfile">libdb.{so,a}</filename></term>
+ <term><filename class="libraryfile">libdb.{a,so}</filename></term>
<listitem>
<para>Contains functions to manipulate database files from C
programs</para>
@@ -284,7 +284,7 @@
</varlistentry>
<varlistentry id="libdb_cxx">
- <term><filename class="libraryfile">libdb_cxx.{so,a}</filename></term>
+ <term><filename class="libraryfile">libdb_cxx.{a,so}</filename></term>
<listitem>
<para>Contains functions to manipulate database files from C++
programs</para>
Modified: branches/systemd/BOOK/chapter06/gcc.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/gcc.xml Tue Feb 18 10:46:43 2014
(r10482)
+++ branches/systemd/BOOK/chapter06/gcc.xml Tue Feb 18 13:28:59 2014
(r10483)
@@ -70,16 +70,17 @@
<para>Prepare GCC for compilation:</para>
-<screen><userinput remap="configure">SED=sed
\
-../gcc-&gcc-version;/configure --prefix=/usr \
- --enable-shared \
- --enable-threads=posix \
- --enable-__cxa_atexit \
- --enable-clocale=gnu \
- --enable-languages=c,c++ \
- --disable-multilib \
- --disable-bootstrap \
- --with-system-zlib</userinput></screen>
+<screen><userinput remap="configure">SED=sed \
+../gcc-&gcc-version;/configure \
+ --prefix=/usr \
+ --enable-shared \
+ --enable-threads=posix \
+ --enable-__cxa_atexit \
+ --enable-clocale=gnu \
+ --enable-languages=c,c++ \
+ --disable-multilib \
+ --disable-bootstrap \
+ --with-system-zlib</userinput></screen>
<para>Note that for other languages, there are some prerequisites that
are not available. See the BLFS Book for instructions on how to
Modified: branches/systemd/BOOK/chapter06/glibc.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/glibc.xml Tue Feb 18 10:46:43 2014
(r10482)
+++ branches/systemd/BOOK/chapter06/glibc.xml Tue Feb 18 13:28:59 2014
(r10483)
@@ -58,13 +58,6 @@
<screen><userinput remap="pre">sed -i 's/\\$$(pwd)/`pwd`/'
timezone/Makefile</userinput></screen>
- <para>The Glibc build system is self-contained and will install
- perfectly, even though the compiler specs file and linker are still
- pointing at <filename class="directory">/tools</filename>. The specs
- and linker cannot be adjusted before the Glibc install because the
- Glibc autoconf tests would give false results and defeat the goal
- of achieving a clean build.</para>
-
<para>Some of the Glibc programs use non-FHS compilant
<filename class="directory">/var/db</filename> directory to store
their runtime data. Apply the following patch to make such programs
@@ -72,6 +65,13 @@
<screen><userinput remap="pre">patch -Np1 -i
../&glibc-fhs-patch;</userinput></screen>
+ <para>The Glibc build system is self-contained and will install
+ perfectly, even though the compiler specs file and linker are still
+ pointing at <filename class="directory">/tools</filename>. The specs
+ and linker cannot be adjusted before the Glibc install because the
+ Glibc autoconf tests would give false results and defeat the goal
+ of achieving a clean build.</para>
+
<para>The Glibc documentation recommends building Glibc outside of the
source
directory in a dedicated build directory:</para>
@@ -80,7 +80,7 @@
<para>Prepare Glibc for compilation:</para>
-<screen><userinput remap="configure">../glibc-&glibc-version;/configure
\
+<screen><userinput remap="configure">../glibc-&glibc-version;/configure \
--prefix=/usr \
--disable-profile \
--enable-kernel=&min-kernel; \
@@ -352,7 +352,7 @@
<para>Then create the <filename>/etc/localtime</filename> file by
running:</para>
-<screen><userinput>ln -sv
/usr/share/zoneinfo/<replaceable><xxx></replaceable>
/etc/localtime</userinput></screen>
+<screen><userinput>ln -sfv
/usr/share/zoneinfo/<replaceable><xxx></replaceable>
/etc/localtime</userinput></screen>
<para>Replace <replaceable><xxx></replaceable> with the name of the
time zone selected (e.g., Canada/Eastern).</para>
@@ -431,9 +431,9 @@
/usr/include/netipx, /usr/include/netiucv, /usr/include/netpacket,
/usr/include/netrom, /usr/include/netrose, /usr/include/nfs,
/usr/include/protocols, /usr/include/rpc, /usr/include/rpcsvc,
- /usr/include/sys, /usr/lib/audit, /usr/lib/gconv, /usr/lib/getconf,
- /usr/lib/locale, /usr/share/i18n, /usr/share/zoneinfo, /var/cache/nscd,
- and /var/lib/nss_db</seg>
+ /usr/include/sys, /usr/lib/audit, /usr/lib/gconv, /usr/lib/locale,
+ /usr/libexec/getconf, /usr/share/i18n, /usr/share/zoneinfo,
+ /var/cache/nscd, and /var/lib/nss_db</seg>
</seglistitem>
</segmentedlist>
Modified: branches/systemd/BOOK/chapter06/kmod.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/kmod.xml Tue Feb 18 10:46:43 2014
(r10482)
+++ branches/systemd/BOOK/chapter06/kmod.xml Tue Feb 18 13:28:59 2014
(r10483)
@@ -46,8 +46,8 @@
<screen><userinput remap="configure">./configure --prefix=/usr \
--bindir=/bin \
--sysconfdir=/etc \
- --disable-manpages \
--with-rootlibdir=/lib \
+ --disable-manpages \
--with-xz \
--with-zlib</userinput></screen>
@@ -88,10 +88,10 @@
<screen><userinput remap="test">make check</userinput></screen>
- <para>Install the package, and create symlinks for compatibility with
- Module-Init-Tools, the package that previously handled Linux kernel
modules.
- Also make sure that all libraries are in the correct directory:
- </para>
+ <para>Install the package, create symlinks for compatibility with
+ Module-Init-Tools (the package that previously handled Linux kernel
+ modules), and manually install the man pages. Also make sure that all
+ libraries are in the correct directory: </para>
<screen><userinput remap="install">make install
@@ -99,7 +99,10 @@
ln -sv ../bin/kmod /sbin/$target
done
-ln -sv kmod /bin/lsmod</userinput></screen>
+ln -sv kmod /bin/lsmod
+
+cp -v man/*.5 /usr/share/man/man5
+cp -v man/*.8 /usr/share/man/man8</userinput></screen>
</sect2>
Modified: branches/systemd/BOOK/chapter06/pcre.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/pcre.xml Tue Feb 18 10:46:43 2014
(r10482)
+++ branches/systemd/BOOK/chapter06/pcre.xml Tue Feb 18 13:28:59 2014
(r10483)
@@ -106,7 +106,7 @@
<seglistitem>
<seg>pcregrep, pcretest, and pcre-config</seg>
- <seg>libpcre.{so,a}, libpcrecpp.{so,a} and libpcreposix.{so,a}</seg>
+ <seg>libpcre.{a,so}, libpcrecpp.{a,so} and libpcreposix.{a,so}</seg>
<seg>/usr/share/doc/pcre-&pcre-version;</seg>
</seglistitem>
</segmentedlist>
Modified: branches/systemd/BOOK/chapter06/procps.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/procps.xml Tue Feb 18 10:46:43 2014
(r10482)
+++ branches/systemd/BOOK/chapter06/procps.xml Tue Feb 18 13:28:59 2014
(r10483)
@@ -70,7 +70,6 @@
To run the test suite, run the following commands:</para>
<screen><userinput remap="test">sed -i -r 's|(pmap_initname)\\\$|\1|'
testsuite/pmap.test/pmap.exp
-
make check</userinput></screen>
<para>Install the package:</para>
Modified: branches/systemd/BOOK/chapter06/readline.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/readline.xml Tue Feb 18 10:46:43
2014 (r10482)
+++ branches/systemd/BOOK/chapter06/readline.xml Tue Feb 18 13:28:59
2014 (r10483)
@@ -90,9 +90,8 @@
<para>If desired, install the documentation:</para>
-<screen><userinput remap="install">mkdir -v
/usr/share/doc/readline-&readline-version;
-install -v -m644 doc/*.{ps,pdf,html,dvi} \
-
/usr/share/doc/readline-&readline-version;</userinput></screen>
+<screen><userinput remap="install">mkdir -v
/usr/share/doc/readline-&readline-version;
+install -v -m644 doc/*.{ps,pdf,html,dvi}
/usr/share/doc/readline-&readline-version;</userinput></screen>
</sect2>
Modified: branches/systemd/BOOK/chapter06/shadow.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/shadow.xml Tue Feb 18 10:46:43 2014
(r10482)
+++ branches/systemd/BOOK/chapter06/shadow.xml Tue Feb 18 13:28:59 2014
(r10483)
@@ -69,8 +69,7 @@
<note>
<para>If you chose to build Shadow with Cracklib support, run the
following:</para>
-<screen role="nodump"><userinput>sed -i
's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' \
- etc/login.defs</userinput></screen>
+<screen role="nodump"><userinput>sed -i
's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@'
etc/login.defs</userinput></screen>
</note>
<para>Prepare Shadow for compilation:</para>
Modified: branches/systemd/BOOK/chapter06/strippingagain.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/strippingagain.xml Tue Feb 18 10:46:43
2014 (r10482)
+++ branches/systemd/BOOK/chapter06/strippingagain.xml Tue Feb 18 13:28:59
2014 (r10483)
@@ -32,15 +32,15 @@
<para>Then reenter it with:</para>
-<screen role="nodump"><userinput>chroot $LFS /tools/bin/env -i \
+<screen role="nodump"><userinput>chroot $LFS /tools/bin/env -i \
HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
- PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+ PATH=/bin:/usr/bin:/sbin:/usr/sbin \
/tools/bin/bash --login</userinput></screen>
<para>Now the binaries and libraries can be safely stripped:</para>
<screen><userinput>/tools/bin/find /{,usr/}{bin,lib,sbin} -type f \
- -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
+ -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
<para>A large number of files will be reported as having their file
format not recognized. These warnings can be safely ignored. These
Modified: branches/systemd/BOOK/chapter06/util-linux.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/util-linux.xml Tue Feb 18 10:46:43
2014 (r10482)
+++ branches/systemd/BOOK/chapter06/util-linux.xml Tue Feb 18 13:28:59
2014 (r10483)
@@ -50,7 +50,7 @@
following:</para>
<screen><userinput remap="pre">sed -i -e
's@etc/adjtime@var/lib/hwclock/adjtime@g' \
- $(grep -rl '/etc/adjtime' .)
+ $(grep -rl '/etc/adjtime' .)
mkdir -pv /var/lib/hwclock</userinput></screen>
Modified: branches/systemd/BOOK/chapter06/xz.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/xz.xml Tue Feb 18 10:46:43 2014
(r10482)
+++ branches/systemd/BOOK/chapter06/xz.xml Tue Feb 18 13:28:59 2014
(r10483)
@@ -6,10 +6,10 @@
]>
<sect1 id="ch-system-xz" role="wrap">
- <?dbhtml filename="xz-utils.html"?>
+ <?dbhtml filename="xz.html"?>
<sect1info condition="script">
- <productname>xz-utils</productname>
+ <productname>xz</productname>
<productnumber>&xz-version;</productnumber>
<address>&xz-url;</address>
</sect1info>
Modified: branches/systemd/BOOK/general.ent
==============================================================================
--- branches/systemd/BOOK/general.ent Tue Feb 18 10:46:43 2014 (r10482)
+++ branches/systemd/BOOK/general.ent Tue Feb 18 13:28:59 2014 (r10483)
@@ -1,5 +1,5 @@
-<!ENTITY version "20140217-SYSTEMD">
-<!ENTITY releasedate "February 17, 2014">
+<!ENTITY version "20140218-SYSTEMD">
+<!ENTITY releasedate "February 18, 2014">
<!ENTITY copyrightdate "1999-2014"><!-- jhalfs needs a literal dash, not
– -->
<!ENTITY milestone "7.5">
<!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or
"x.y[-pre{x}]" -->
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
