diff options
| -rw-r--r-- | chapter01/changelog.xml | 11 | ||||
| -rw-r--r-- | chapter05/binutils-pass1.xml | 2 | ||||
| -rw-r--r-- | chapter05/binutils-pass2.xml | 2 | ||||
| -rw-r--r-- | chapter05/expect.xml | 5 | ||||
| -rw-r--r-- | chapter05/gcc-pass2.xml | 2 | ||||
| -rw-r--r-- | chapter05/libstdc++.xml | 14 | ||||
| -rw-r--r-- | chapter05/stripping.xml | 5 | ||||
| -rw-r--r-- | chapter06/creatingdirs.xml | 6 | ||||
| -rw-r--r-- | chapter06/db.xml | 4 | ||||
| -rw-r--r-- | chapter06/findutils.xml | 3 | ||||
| -rw-r--r-- | chapter06/flex.xml | 5 | ||||
| -rw-r--r-- | chapter06/gcc.xml | 21 | ||||
| -rw-r--r-- | chapter06/gdbm.xml | 2 | ||||
| -rw-r--r-- | chapter06/gettext.xml | 3 | ||||
| -rw-r--r-- | chapter06/glibc.xml | 8 | ||||
| -rw-r--r-- | chapter06/kmod.xml | 7 | ||||
| -rw-r--r-- | chapter06/pcre.xml | 2 | ||||
| -rw-r--r-- | chapter06/procps.xml | 1 | ||||
| -rw-r--r-- | chapter06/readline.xml | 5 | ||||
| -rw-r--r-- | chapter06/shadow.xml | 3 | ||||
| -rw-r--r-- | chapter06/strippingagain.xml | 6 | ||||
| -rw-r--r-- | chapter06/util-linux.xml | 2 | ||||
| -rw-r--r-- | chapter06/xz.xml | 3 | ||||
| -rw-r--r-- | general.ent | 4 |
24 files changed, 68 insertions, 58 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 929bad666..6ab8be734 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -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-16</para> <itemizedlist> <listitem> diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index 6766005fa..decec8b6f 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -72,7 +72,7 @@ cd ../binutils-build</userinput></screen> <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 \ diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml index 69d0e3ff3..9ebf763e7 100644 --- a/chapter05/binutils-pass2.xml +++ b/chapter05/binutils-pass2.xml @@ -53,7 +53,7 @@ cd ../binutils-build</userinput></screen> <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 \ diff --git a/chapter05/expect.xml b/chapter05/expect.xml index d53394504..ae6f50026 100644 --- a/chapter05/expect.xml +++ b/chapter05/expect.xml @@ -51,8 +51,9 @@ sed 's:/usr/local/bin:/bin:' configure.orig > configure</userinput></screen> <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> diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index e96c469ad..6fb0792c4 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -77,7 +77,7 @@ esac</userinput></screen> 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 diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml index 9a6ad2415..23d0a3a4a 100644 --- a/chapter05/libstdc++.xml +++ b/chapter05/libstdc++.xml @@ -56,13 +56,13 @@ cd ../gcc-build</userinput></screen> <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> diff --git a/chapter05/stripping.xml b/chapter05/stripping.xml index 2d8fe6568..ad2cb3ae0 100644 --- a/chapter05/stripping.xml +++ b/chapter05/stripping.xml @@ -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 diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml index 5443326a9..8240d2f35 100644 --- a/chapter06/creatingdirs.xml +++ b/chapter06/creatingdirs.xml @@ -22,9 +22,13 @@ mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man} 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 diff --git a/chapter06/db.xml b/chapter06/db.xml index 0a899962b..5549c2ed4 100644 --- a/chapter06/db.xml +++ b/chapter06/db.xml @@ -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> diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index c7424bf0c..94a2985b0 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -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> diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 6b4d42363..8ec53658b 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -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 @@ 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> diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 7fe9fe94d..83cac4ece 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -70,16 +70,17 @@ cd ../gcc-build</userinput></screen> <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 diff --git a/chapter06/gdbm.xml b/chapter06/gdbm.xml index f0e34616d..051207671 100644 --- a/chapter06/gdbm.xml +++ b/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> diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml index 684cd3060..8c64a5059 100644 --- a/chapter06/gettext.xml +++ b/chapter06/gettext.xml @@ -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> diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 4d198ca1b..c88b6a6b0 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -73,10 +73,10 @@ cd ../glibc-build</userinput></screen> <para>Prepare Glibc for compilation:</para> -<screen><userinput remap="configure">../glibc-&glibc-version;/configure \ - --prefix=/usr \ - --disable-profile \ - --enable-kernel=&min-kernel; \ +<screen><userinput remap="configure">../glibc-&glibc-version;/configure \ + --prefix=/usr \ + --disable-profile \ + --enable-kernel=&min-kernel; \ --enable-obsolete-rpc</userinput></screen> <variablelist> diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml index 9832437d1..c772c6436 100644 --- a/chapter06/kmod.xml +++ b/chapter06/kmod.xml @@ -46,7 +46,6 @@ <screen><userinput remap="configure">./configure --prefix=/usr \ --bindir=/bin \ --sysconfdir=/etc \ - --disable-manpages \ --with-rootlibdir=/lib \ --with-xz \ --with-zlib</userinput></screen> @@ -60,16 +59,16 @@ <para>These options enable Kmod to handle compressed kernel modules.</para> </listitem> </varlistentry> - +<!-- <varlistentry> - <term><parameter>--disable-manpages</parameter></term> + <term><parameter>- -disable-manpages</parameter></term> <listitem> <para>This option prevents the man pages from being built, as they rely on libxslt, which isn't available in the chroot environment.</para> </listitem> </varlistentry> - +--> <varlistentry> <term><parameter>--with-rootlibdir=/lib</parameter></term> <listitem> diff --git a/chapter06/pcre.xml b/chapter06/pcre.xml index 800d0aa04..f44e5003d 100644 --- a/chapter06/pcre.xml +++ b/chapter06/pcre.xml @@ -106,7 +106,7 @@ ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so</userinput></screen> <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> diff --git a/chapter06/procps.xml b/chapter06/procps.xml index 0114b1e6b..3dbafd4d7 100644 --- a/chapter06/procps.xml +++ b/chapter06/procps.xml @@ -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> diff --git a/chapter06/readline.xml b/chapter06/readline.xml index 6ad6ecaaa..2b0c334fc 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -90,9 +90,8 @@ ln -sfv ../../lib/$(readlink /usr/lib/libhistory.so ) /usr/lib/libhistory.so</us <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> diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml index acbbbf7ac..0f30426d8 100644 --- a/chapter06/shadow.xml +++ b/chapter06/shadow.xml @@ -69,8 +69,7 @@ find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></scr <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> diff --git a/chapter06/strippingagain.xml b/chapter06/strippingagain.xml index 14f87829d..5492e679c 100644 --- a/chapter06/strippingagain.xml +++ b/chapter06/strippingagain.xml @@ -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 diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 063082be0..5afa8965b 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -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> diff --git a/chapter06/xz.xml b/chapter06/xz.xml index 2f21e0f29..c90409a16 100644 --- a/chapter06/xz.xml +++ b/chapter06/xz.xml @@ -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> diff --git a/general.ent b/general.ent index 9fef9411a..04131a2c2 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20140216"> -<!ENTITY releasedate "February 16, 2015"> +<!ENTITY version "SVN-20140218"> +<!ENTITY releasedate "February 18, 2015"> <!ENTITY copyrightdate "1999-2014"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.5"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> |