gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-05 22:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change kmod instructions to allow installation of man pages.

Browse Source 
Numerous whitespace fixes.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10480 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Bruce Dubbs 2014-02-18 07:16:55 +00:00
parent 177aee0f06
commit 3dc9543a1e
24 changed files with 68 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
chapter01/changelog.xml
View File

@ -35,6 +35,17 @@
</itemizedlist>
</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>

2
chapter05/binutils-pass1.xml
View File

@ -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 \

2
chapter05/binutils-pass2.xml
View File

@ -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 \

5
chapter05/expect.xml
View File

@ -51,8 +51,9 @@ sed 's:/usr/local/bin:/bin:' configure.orig &gt; 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>

2
chapter05/gcc-pass2.xml
View File

@ -77,7 +77,7 @@ esac</userinput></screen>
do
cp -uv $file{,.orig}
sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&amp;@g' \
-e 's@/usr@/tools@g' $file.orig &gt; $file
-e 's@/usr@/tools@g' $file.orig &gt; $file
echo '
#undef STANDARD_STARTFILE_PREFIX_1
#undef STANDARD_STARTFILE_PREFIX_2

14
chapter05/libstdc++.xml
View File

@ -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>

5
chapter05/stripping.xml
View File

@ -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

6
chapter06/creatingdirs.xml
View File

@ -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 &amp;&amp; ln -sv lib /usr/lib64 &amp;&amp; ln -sv lib /usr/local/lib64 ;;
x86_64) ln -sv lib /lib64 &amp;&amp;
ln -sv lib /usr/lib64 &amp;&amp;
ln -sv lib /usr/local/lib64 ;;
esac
mkdir -v /var/{log,mail,spool}
ln -sv /run /var/run
ln -sv /run/lock /var/lock

4
chapter06/db.xml
View File

@ -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>

3
chapter06/findutils.xml
View File

@ -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>

5
chapter06/flex.xml
View File

@ -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>

21
chapter06/gcc.xml
View File

@ -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

2
chapter06/gdbm.xml
View File

@ -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>

3
chapter06/gettext.xml
View File

@ -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>

8
chapter06/glibc.xml
View File

@ -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>

7
chapter06/kmod.xml
View File

@ -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>

2
chapter06/pcre.xml
View File

@ -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>

1
chapter06/procps.xml
View File

@ -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>

5
chapter06/readline.xml
View File

@ -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>

3
chapter06/shadow.xml
View File

@ -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>

6
chapter06/strippingagain.xml
View File

@ -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

2
chapter06/util-linux.xml
View File

@ -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>

3
chapter06/xz.xml
View File

@ -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>

4
general.ent
View File

@ -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 &ndash; -->
<!ENTITY milestone "7.5">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->