aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appendixa/appendixa.xml1
-rw-r--r--appendixa/utillinux-desc.xml15
-rw-r--r--chapter03/creatingpart.xml10
-rw-r--r--chapter03/introduction.xml6
-rw-r--r--chapter04/packages.xml1
-rw-r--r--chapter05/diffutils-inst.xml6
-rw-r--r--chapter05/fileutils-inst.xml5
-rw-r--r--chapter05/findutils-inst.xml2
-rw-r--r--chapter05/gawk-inst.xml2
-rw-r--r--chapter05/gcc-exp.xml4
-rw-r--r--chapter05/gcc-inst.xml1
-rw-r--r--chapter05/grep-inst.xml6
-rw-r--r--chapter05/patch-inst.xml2
-rw-r--r--chapter05/sed-inst.xml2
-rw-r--r--chapter05/texinfo-inst.xml4
-rw-r--r--chapter05/whystatic.xml2
-rw-r--r--chapter06/chapter06.xml1
-rw-r--r--chapter06/glibc-exp.xml4
-rw-r--r--chapter06/glibc-inst.xml2
-rw-r--r--chapter06/man-inst.xml5
-rw-r--r--chapter06/patch-inst.xml2
-rw-r--r--chapter08/kernel.xml9
-rw-r--r--chapter09/reboot.xml7
-rw-r--r--entities/file.ent8
-rw-r--r--entities/utillinux.ent8
-rw-r--r--index.xml6
26 files changed, 75 insertions, 46 deletions
diff --git a/appendixa/appendixa.xml b/appendixa/appendixa.xml
index fd5cf098f..6fef9c764 100644
--- a/appendixa/appendixa.xml
+++ b/appendixa/appendixa.xml
@@ -44,7 +44,6 @@
&aa-procinfo;
&aa-procps;
&aa-psmisc;
-&aa-reiserfs;
&aa-sed;
&aa-shadowpwd;
&aa-shellutils;
diff --git a/appendixa/utillinux-desc.xml b/appendixa/utillinux-desc.xml
index c00555f16..ba867d88c 100644
--- a/appendixa/utillinux-desc.xml
+++ b/appendixa/utillinux-desc.xml
@@ -5,9 +5,9 @@
<sect3><title>Program Files</title>
<para>agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt,
colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat, fdisk,
-fsck.minix, getopt, hexdump, hwclock, ipcrm, ipcs, isosize, line, logger,
-look, losetup, mcookie, mkfs, mkfs.bfs, mkfs.minix, mkswap, more, mount,
-namei, parse.bash, parse.tcsh, pivot_root, ramsize (link to rdev),
+fsck.cramfs, fsck.minix, getopt, hexdump, hwclock, ipcrm, ipcs, isosize, line, logger,
+look, losetup, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap, more, mount,
+namei, parse.bash, parse.tcsh, pg, pivot_root, ramsize (link to rdev),
raw, rdev, readprofile, rename, renice, rev, rootflags (link to rdev),
script, setfdprm, setsid, setterm, sfdisk, swapoff (link to swapon), swapon,
test.bash, test.tcsh, tunelp, ul, umount, vidmode (link to rdev), whereis
@@ -73,6 +73,9 @@ basis.</para></sect4>
<sect4><title>fdisk</title>
<para>fdisk is a disk partition table manipulator.</para></sect4>
+<sect4><title>fsck.cramfs</title>
+<para>No description is currently available.</para></sect4>
+
<sect4><title>fsck.minix</title>
<para>fsck.minix performs a consistency check for the Linux MINIX
filesystem.</para></sect4>
@@ -122,6 +125,9 @@ partition.</para></sect4>
<para>mkfs.bfs creates a SCO bfs file system on a device, usually a harddisk
partition.</para></sect4>
+<sect4><title>mkfs.cramfs</title>
+<para>No description is currently available.</para></sect4>
+
<sect4><title>mkfs.minix</title>
<para>mkfs.minix creates a Linux MINIX filesystem on a device, usually a
harddisk partition.</para></sect4>
@@ -144,6 +150,9 @@ point).</para></sect4>
<para>These are example scripts for using the getopt program with either
BASH or TCSH.</para></sect4>
+<sect4><title>pg</title>
+<para>No description is currently available.</para></sect4>
+
<sect4><title>pivot_root</title>
<para>pivot_root moves the root file system of the current process.</para></sect4>
diff --git a/chapter03/creatingpart.xml b/chapter03/creatingpart.xml
index 5ac749991..03fd29709 100644
--- a/chapter03/creatingpart.xml
+++ b/chapter03/creatingpart.xml
@@ -23,11 +23,11 @@ skipped.</para>
<para>The cfdisk program (or another fdisk like program you prefer) is
to be started with the appropriate hard disk as the option (like /dev/hda
if a new partition is to be created on the primary master IDE disk). It is
-used to create a Linux Native partition, write the partition table and exit
-the cfdisk program. Please refer to the documentation that comes with your
-fdisk program of choice (the man pages are often a good place to start)
-and read the procedures about how to create a new Linux native
-partition and how to write the partition table.</para>
+used to create a Linux Native partition and to write the partition table.
+Please refer to the documentation that comes with your fdisk program of
+choice (the man pages are often a good place to start) and read the
+procedures about how to create a new Linux native partition and how to
+write the partition table.</para>
<para>The new partition's designation should be remembered. It
could be something like hda11. This newly created partition will be
diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml
index bef31fb9d..956f69aba 100644
--- a/chapter03/introduction.xml
+++ b/chapter03/introduction.xml
@@ -2,9 +2,9 @@
<title>Introduction</title>
<?dbhtml filename="introduction.html" dir="chapter04"?>
-<para>In this chapter the partition that is going to host the LFS system is
-prepared. We will create the partition itself, make a file
-system on it, and mount it.</para>
+<para>In this chapter, the partition which will host the LFS system is
+prepared. We will create the partition itself, make a file system on it,
+and mount it.</para>
</sect1>
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index 43c3f2532..e7d1f3c24 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -60,7 +60,6 @@
&c3-procinfo;
&c3-procps;
&c3-psmisc;
-&c3-reiserfs;
&c3-shadowpwd;
&c3-sysklogd;
&c3-sysvinit;
diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml
index f5f59fd15..1d83c6337 100644
--- a/chapter05/diffutils-inst.xml
+++ b/chapter05/diffutils-inst.xml
@@ -3,9 +3,9 @@
<para>Install Diffutils by running the following commands:</para>
-<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/static --disable-nls &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
+<para><screen><userinput>LDFLAGS=-static CPPFLAGS=-Dre_max_failures=re_max_failures2 \
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static --disable-nls &amp;&amp;
+make &amp;&amp;
make install</userinput></screen></para>
</sect2>
diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml
index 89deed1f9..8e209b4e1 100644
--- a/chapter05/fileutils-inst.xml
+++ b/chapter05/fileutils-inst.xml
@@ -25,8 +25,9 @@ than likely result in all kinds of compile time problems.</para>
<para>Install Fileutils by running the following commands:</para>
-<para><screen><userinput>./configure --disable-nls --prefix=$LFS/static &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
+<para><screen><userinput>LDFLAGS=-static \
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --disable-nls --prefix=$LFS/static &amp;&amp;
+make &amp;&amp;
make install</userinput></screen></para>
<para>Once you have installed Fileutils, you can test whether the
diff --git a/chapter05/findutils-inst.xml b/chapter05/findutils-inst.xml
index 2247dedf1..6fd3b61a2 100644
--- a/chapter05/findutils-inst.xml
+++ b/chapter05/findutils-inst.xml
@@ -9,7 +9,7 @@ commands.</para>
<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch &amp;&amp;
CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/static &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static &amp;&amp;
make LDFLAGS=-static &amp;&amp;
make install</userinput></screen></para>
diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml
index e5f97ae6d..0ca0902ba 100644
--- a/chapter05/gawk-inst.xml
+++ b/chapter05/gawk-inst.xml
@@ -5,7 +5,7 @@
running the following commands:</para>
<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/static --disable-nls &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static --disable-nls &amp;&amp;
make LDFLAGS=-static &amp;&amp;
make install</userinput></screen></para>
diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml
index b298990df..254e713ff 100644
--- a/chapter05/gcc-exp.xml
+++ b/chapter05/gcc-exp.xml
@@ -18,6 +18,10 @@ the --enable-languages parameter may be omitted.</para>
<para><userinput>--enable-threads=posix:</userinput> This enables C++
exception handling for multithreaded code.</para>
+<para><userinput>echo "#define HAVE_GAS_HIDDEN 1":</userinput>
+This defines the .hidden assembler directive so that we don't build
+a faulty Glibc later on.</para>
+
<para><userinput>ln -s gcc $LFS/static/bin/cc:</userinput> This
creates the $LFS/static/bin/gcc symlink which some packages need.</para>
diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml
index 13f283098..c0a9c97ef 100644
--- a/chapter05/gcc-inst.xml
+++ b/chapter05/gcc-inst.xml
@@ -14,6 +14,7 @@ been warned.</para>
cd ../gcc-build &amp;&amp;
../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \
&nbsp;&nbsp;&nbsp;--disable-nls --disable-shared --enable-threads=posix &amp;&amp;
+echo "#define HAVE_GAS_HIDDEN 1" >> gcc/auto-host.h &amp;&amp;
make BOOT_LDFLAGS=-static bootstrap &amp;&amp;
make prefix=$LFS/static install &amp;&amp;
ln -s gcc $LFS/static/bin/cc</userinput></screen></para>
diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml
index 18fe41068..164b0f73f 100644
--- a/chapter05/grep-inst.xml
+++ b/chapter05/grep-inst.xml
@@ -3,10 +3,10 @@
<para>Install Grep by running the following commands:</para>
-<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/static --disable-nls \
+<para><screen><userinput>LDFLAGS=-static CPPFLAGS=-Dre_max_failures=re_max_failures2 \
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static --disable-nls \
&nbsp;&nbsp;&nbsp;&nbsp;--disable-perl-regexp &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
+make &amp;&amp;
make install</userinput></screen></para>
</sect2>
diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml
index 4528b7f2b..6017a3593 100644
--- a/chapter05/patch-inst.xml
+++ b/chapter05/patch-inst.xml
@@ -4,7 +4,7 @@
<para>Install Patch by running the following commands:</para>
<para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE \
-./configure --prefix=$LFS/static &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static &amp;&amp;
make LDFLAGS=-static &amp;&amp;
make install</userinput></screen></para>
diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml
index 1f30b36e8..775bd86fe 100644
--- a/chapter05/sed-inst.xml
+++ b/chapter05/sed-inst.xml
@@ -4,7 +4,7 @@
<para>Install Sed by running the following commands:</para>
<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/static &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static &amp;&amp;
make LDFLAGS=-static &amp;&amp;
make install</userinput></screen></para>
diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml
index 0e36b6b96..7e4c29bff 100644
--- a/chapter05/texinfo-inst.xml
+++ b/chapter05/texinfo-inst.xml
@@ -3,9 +3,9 @@
<para>Install Texinfo by running the following commands:</para>
-<para><screen><userinput>./configure --prefix=$LFS/static \
+<para><screen><userinput>LDFLAGS=-static ./configure --prefix=$LFS/static \
&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
+make &amp;&amp;
make install</userinput></screen></para>
</sect2>
diff --git a/chapter05/whystatic.xml b/chapter05/whystatic.xml
index e00b2f8d4..cdcab4d1a 100644
--- a/chapter05/whystatic.xml
+++ b/chapter05/whystatic.xml
@@ -19,7 +19,7 @@ has.</para>
can often be around 2.5 MB), so you may not want a separate copy of each
library attached to the program. Just imagine if you had a simple command
like ls with an extra 2.5 MB attached to it! Instead of making the library
-an actual part of the program, or statically linked, the library is kept a
+an actual part of the program, or statically linked, the library is stored as a
separate file, which is loaded only when the program needs it. This is what
we call dynamically linked, as the library is loaded and unloaded dynamically,
as the program needs it.</para>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 3ab34012e..e073adfaf 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -56,7 +56,6 @@
&c6-procinfo;
&c6-procps;
&c6-psmisc;
-&c6-reiserfs;
&c6-shadowpwd;
&c6-sysklogd;
&c6-sysvinit;
diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml
index 9c40d702e..0ff5dd789 100644
--- a/chapter06/glibc-exp.xml
+++ b/chapter06/glibc-exp.xml
@@ -19,6 +19,10 @@ cache. If this file doesn't exist, the installation will abort with an error
that it can't read the file, so we simply create an empty file (the empty
file will have Glibc default to using /lib and /usr/lib which is fine).</para>
+<para><userinput>--disable-profile:</userinput> This disables the building
+of libraries with profiling information. This command may be ommitted if
+you plan to do profiling.</para>
+
<para><userinput>--enable-add-ons:</userinput> This enables the add-on that
we install with Glibc: linuxthreads</para>
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index caaacb802..7f0fe0b5d 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -30,7 +30,7 @@ is putting your system at very high risk.</para>
touch /etc/ld.so.conf &amp;&amp;
mkdir ../glibc-build &amp;&amp;
cd ../glibc-build &amp;&amp;
-../glibc-&glibc-version;/configure --prefix=/usr \
+../glibc-&glibc-version;/configure --prefix=/usr --disable-profile \
&nbsp;&nbsp;&nbsp;&nbsp;--enable-add-ons --libexecdir=/usr/bin &amp;&amp;
echo "cross-compiling = no" &gt; configparms &amp;&amp;
make &amp;&amp;
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
index f67465b91..0e8fff874 100644
--- a/chapter06/man-inst.xml
+++ b/chapter06/man-inst.xml
@@ -4,10 +4,9 @@
<para>Run the following commands to install man:</para>
<para><screen><userinput>PATH=$PATH:/usr/bin:/bin \
-&nbsp;&nbsp;&nbsp;&nbsp;./configure -default &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;./configure -default -confdir=/etc &&
make &amp;&amp;
-make install &amp;&amp;
-mv /usr/share/misc/man.conf /etc</userinput></screen></para>
+make install</userinput></screen></para>
<para>You may want to take a look at the man hint
at <ulink url="&hints-root;man.txt"/> which deals with formatting
diff --git a/chapter06/patch-inst.xml b/chapter06/patch-inst.xml
index f7eb8202c..69fa3d24d 100644
--- a/chapter06/patch-inst.xml
+++ b/chapter06/patch-inst.xml
@@ -4,7 +4,7 @@
<para>Install Patch by running the following commands:</para>
<para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE \
-./configure --prefix=/usr &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=/usr &amp;&amp;
make &amp;&amp;
make install</userinput></screen></para>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 9c86edf91..02d587e67 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -22,6 +22,15 @@ can use your current values. If you choose to do this, first run the
See the <filename>README</filename> file for more details when to use
<userinput>make oldconfig</userinput>).</para>
+<para>If you intend to use kernel modules, you will need an
+<filename>/etc/modules.conf</filename> file. Information pertaining
+to modules and to kernel configuration in general may be found in the
+kernel documentation, which is stored stored in
+<filename>/usr/src/linux/Documentation</filename>. The modules.conf man
+page and the kernel HOWTO at
+<ulink url="http://www.tldp.org/HOWTO/Kernel-HOWTO.html"/> may also be of
+interest to you.</para>
+
<para>The following commands are run to build the kernel:</para>
<para><screen><userinput>cd /usr/src/linux &amp;&amp;</userinput>
diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml
index aa94a6756..2a4669c81 100644
--- a/chapter09/reboot.xml
+++ b/chapter09/reboot.xml
@@ -39,6 +39,13 @@ on LFS active:</para>
<para><screen><userinput>/sbin/lilo</userinput></screen></para>
+<para>You may now remove the static directory. If you think you may
+need to redo chapter 5, then you may wish to backup the directory before
+removing it. To remove the static directory, type the following
+command:</para>
+
+<para><screen><userinput>rm -rf /static</userinput></screen></para>
+
<para>Now that you have finished installing your LFS system, you may
be wondering how to install additional software, such as a web browser.
Your first stop should be the Beyond Linux From Scratch project, which may
diff --git a/entities/file.ent b/entities/file.ent
index d20aad561..4b857da8b 100644
--- a/entities/file.ent
+++ b/entities/file.ent
@@ -8,12 +8,12 @@
<!ENTITY aa-file-dep SYSTEM "../appendixa/file-dep.xml">
<!ENTITY aa-file-down SYSTEM "../appendixa/file-down.xml">
-<!ENTITY file-version "3.38">
+<!ENTITY file-version "3.39">
<!ENTITY file-depversion "3.37">
-<!ENTITY file-contversion "3.38">
-<!ENTITY file-size "149 KB">
+<!ENTITY file-contversion "3.39">
+<!ENTITY file-size "151 KB">
<!ENTITY file-dir "file-&file-version;">
<!ENTITY file-package "file-&file-version;.tar.bz2">
-<!ENTITY file-compsize "3 MB">
+<!ENTITY file-compsize "2 MB">
<!ENTITY file-time "1 minute">
diff --git a/entities/utillinux.ent b/entities/utillinux.ent
index ded318049..5349fa323 100644
--- a/entities/utillinux.ent
+++ b/entities/utillinux.ent
@@ -12,14 +12,14 @@
<!ENTITY aa-utillinux-dep SYSTEM "../appendixa/utillinux-dep.xml">
<!ENTITY aa-utillinux-down SYSTEM "../appendixa/utillinux-down.xml">
-<!ENTITY util-linux-version "2.11r">
+<!ENTITY util-linux-version "2.11t">
<!ENTITY util-linux-depversion "2.11n">
-<!ENTITY util-linux-contversion "2.11r">
-<!ENTITY util-linux-size "1,041 KB">
+<!ENTITY util-linux-contversion "2.11t">
+<!ENTITY util-linux-size "1064 KB">
<!ENTITY util-linux-dir "util-linux-&util-linux-version;">
<!ENTITY util-linux-package "util-linux-&util-linux-version;.tar.bz2">
-<!ENTITY util-linux-compsize-static "12 MB">
+<!ENTITY util-linux-compsize-static "11 MB">
<!ENTITY util-linux-time-static "1 minute">
<!ENTITY util-linux-compsize "10 MB">
diff --git a/index.xml b/index.xml
index fd5b2cf51..e0d5b4f10 100644
--- a/index.xml
+++ b/index.xml
@@ -4,8 +4,8 @@
<!ENTITY book SYSTEM "book/book.xml">
-<!ENTITY version "20020708">
-<!ENTITY releasedate "July 8th, 2002">
+<!ENTITY version "200207029">
+<!ENTITY releasedate "July 29th, 2002">
<!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
<!ENTITY http-root "http://ftp.linuxfromscratch.org">
@@ -76,7 +76,6 @@
<!ENTITY % procinfo-entities SYSTEM "entities/procinfo.ent">
<!ENTITY % procps-entities SYSTEM "entities/procps.ent">
<!ENTITY % psmisc-entities SYSTEM "entities/psmisc.ent">
-<!ENTITY % reiserfs-entities SYSTEM "entities/reiserfs.ent">
<!ENTITY % sed-entities SYSTEM "entities/sed.ent">
<!ENTITY % shadow-entities SYSTEM "entities/shadow.ent">
<!ENTITY % shellutils-entities SYSTEM "entities/shellutils.ent">
@@ -145,7 +144,6 @@
%procinfo-entities;
%procps-entities;
%psmisc-entities;
-%reiserfs-entities;
%sed-entities;
%shadow-entities;
%shellutils-entities;