diff options
| author | Mark Hymers <markh@linuxfromscratch.org> | 2001-07-22 19:45:10 +0000 |
|---|---|---|
| committer | Mark Hymers <markh@linuxfromscratch.org> | 2001-07-22 19:45:10 +0000 |
| commit | b822811980a5f82726cb641cbeff66be9eb6d92a (patch) | |
| tree | 27c4db3c62aaea065b053e43c39b2ba44c04a05f /chapter06 | |
| parent | 46f5461af92bc70c62bbb92895032b930954d835 (diff) | |
XML changes
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@827 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
125 files changed, 537 insertions, 1239 deletions
diff --git a/chapter06/aboutdebug.xml b/chapter06/aboutdebug.xml index 094398e2f..b743aa9ab 100644 --- a/chapter06/aboutdebug.xml +++ b/chapter06/aboutdebug.xml @@ -1,70 +1,53 @@ <sect1 id="ch06-aboutdebug"> <title>About debugging symbols</title> -<para> -Most programs and libraries by default are compiled with debugging +<para>Most programs and libraries by default are compiled with debugging symbols (gcc option -g) Let me explain what these debugging symbols -are and why you may not want them. -</para> +are and why you may not want them.</para> -<para> -A program compiled with debugging symbols means a user can run a program or -library through a debugger and the debugger's output will be user +<para>A program compiled with debugging symbols means a user can run a program +or library through a debugger and the debugger's output will be user friendly. These debugging symbols also enlarge the program or library -significantly. -</para> +significantly.</para> -<para> -Before you start wondering whether these debugging symbols really make a +<para>Before you start wondering whether these debugging symbols really make a big difference, here are some statistics. Use them to draw your own -conclusion. -</para> +conclusion.</para> <itemizedlist> -<listitem><para> - A dynamic Bash binary with debugging symbols: 1.2MB -</para></listitem> +<listitem><para>A dynamic Bash binary +with debugging symbols: 1.2MB</para></listitem> -<listitem><para> - A dynamic Bash binary without debugging symbols: 478KB -</para></listitem> +<listitem><para>A dynamic Bash binary +without debugging symbols: 478KB</para></listitem> -<listitem><para> - /lib and /usr/lib (glibc and gcc files) with debugging - symbols: 87MB -</para></listitem> +<listitem><para>/lib and /usr/lib (glibc +and gcc files) with debugging symbols: 87MB</para></listitem> -<listitem><para> - /lib and /usr/lib (glibc and gcc files) without - debugging symbols: 16MB -</para></listitem> +<listitem><para>/lib and /usr/lib (glibc +and gcc files) without debugging symbols: 16MB</para></listitem> </itemizedlist> -<para> -Sizes vary depending on which compiler was used and which C library +<para>Sizes vary depending on which compiler was used and which C library version was used to link dynamic programs against, but results will be similar if you compare programs with and without debugging symbols. After I was done with this chapter and stripped all debugging symbols from all LFS -binaries I regained a little over 102 MB of disk space. Quite the difference. -</para> +binaries I regained a little over 102 MB of disk space. Quite the +difference.</para> -<para> -To remove debugging symbols from a binary (must be an a.out or ELF +<para>To remove debugging symbols from a binary (must be an a.out or ELF binary) run <userinput>strip --strip-debug filename</userinput>. Wild cards can be used to strip debugging symbols from multiple files (use something like <userinput>strip --strip-debug $LFS/usr/bin/*</userinput>). Most people will probably never use a debugger on software, so by -removing those symbols a lot of disk space can be regained. -</para> +removing those symbols a lot of disk space can be regained.</para> -<para> -You might find additional information in the optimization hint which can +<para>You might find additional information in the optimization hint which can be found at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/optimization.txt"> -http://archive.linuxfromscratch.org/lfs-hints/optimization.txt</ulink>. -</para> +url="http://archive.linuxfromscratch.org/lfs-hints/optimization.txt">http://archive.linuxfromscratch.org/lfs-hints/optimization.txt</ulink> +.</para> </sect1> diff --git a/chapter06/autoconf-inst.xml b/chapter06/autoconf-inst.xml index 557f6753d..34bdaad56 100644 --- a/chapter06/autoconf-inst.xml +++ b/chapter06/autoconf-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Autoconf</title> -<para> -Install Autoconf by running the following commands: -</para> +<para>Install Autoconf by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml index 10caa664b..0f8b40b7d 100644 --- a/chapter06/autoconf.xml +++ b/chapter06/autoconf.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-autoconf"> <title>Installing Autoconf</title> -<screen> -Estimated build time: &autoconf-time; -Estimated disk space required: &autoconf-compsize; -</screen> +<screen>Estimated build time: &autoconf-time; +Estimated disk space required: &autoconf-compsize;</screen> &c6-autoconf-inst; &aa-autoconf-desc; diff --git a/chapter06/automake-inst.xml b/chapter06/automake-inst.xml index 09a378452..c3bbd13b3 100644 --- a/chapter06/automake-inst.xml +++ b/chapter06/automake-inst.xml @@ -1,16 +1,10 @@ <sect2> <title>Installation of Automake</title> -<para> -Install Automake by running the following commands: -</para> +<para>Install Automake by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/automake.xml b/chapter06/automake.xml index 0716739ff..95e27a093 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-automake"> <title>Installing Automake</title> -<screen> -Estimated build time: &automake-time; -Estimated disk space required: &automake-compsize; -</screen> +<screen>Estimated build time: &automake-time; +Estimated disk space required: &automake-compsize;</screen> &c6-automake-inst; &aa-automake-desc; diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml index 677a75ece..653d49166 100644 --- a/chapter06/bash-inst.xml +++ b/chapter06/bash-inst.xml @@ -1,30 +1,19 @@ <sect2> <title>Installation of Bash</title> -<para> -Install Bash by running the following commands: -</para> +<para>Install Bash by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --with-curses &&</userinput> +<para><screen><userinput>./configure --prefix=/usr --with-curses &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>logout</userinput> <userinput>mv $LFS/usr/bin/bash $LFS/usr/bin/bashbug $LFS/bin</userinput> -</screen> -</para> +</screen></para> -<para> -The static bash is replaced with the dynamic bash and the chroot'ed -environment is re-entered by running: -</para> +<para>The static bash is replaced with the dynamic bash and the chroot'ed +environment is re-entered by running:</para> -<para> -<screen> -&c6-chrootcmd; -</screen> -</para> +<para><screen>&c6-chrootcmd;</screen></para> </sect2> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index 380825a61..43388b039 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-bash"> <title>Installing Bash</title> -<screen> -Estimated build time: &bash-time; -Estimated disk space required: &bash-compsize; -</screen> +<screen>Estimated build time: &bash-time; +Estimated disk space required: &bash-compsize;</screen> &c6-bash-inst; &aa-bash-desc; diff --git a/chapter06/bashprofile.xml b/chapter06/bashprofile.xml index b6543425c..abfed3700 100644 --- a/chapter06/bashprofile.xml +++ b/chapter06/bashprofile.xml @@ -1,22 +1,16 @@ <sect1 id="ch06-bashprofile"> <title>Creating $LFS/root/.bash_profile</title> -<para> -When we have entered the chroot'ed environment in the next section we +<para>When we have entered the chroot'ed environment in the next section we want to export a couple of environment variables in that shell such as PS1, PATH and others variables which are good to have set. For that purpose we'll create the $LFS/root/.bash_profile file which will be read -by bash when we enter the chroot environment. -</para> +by bash when we enter the chroot environment.</para> -<para> -Create a new file <filename>$LFS/root/.bash_profile</filename> -by running the following. -</para> +<para>Create a new file <filename>$LFS/root/.bash_profile</filename> +by running the following.</para> -<para> -<screen> -<userinput>cat > $LFS/root/.bash_profile << "EOF"</userinput> +<para><screen><userinput>cat > $LFS/root/.bash_profile << "EOF"</userinput> # Begin /root/.bash_profile PS1='\u:\w\$ ' @@ -25,16 +19,12 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin export PS1 PATH # End /root/.bash_profile -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> -<para> -The PS1 variable is an environment variable that controls the appearance of -the command prompt. See the bash man page for details how this variable +<para>The PS1 variable is an environment variable that controls the appearance +of the command prompt. See the bash man page for details how this variable is constructed. Additional environment variables, aliases and so forth that are -needed and/or wanted can be added at your own discretion. -</para> +needed and/or wanted can be added at your own discretion.</para> </sect1> diff --git a/chapter06/bin86-exp.xml b/chapter06/bin86-exp.xml index dd15f0f88..5d0c31040 100644 --- a/chapter06/bin86-exp.xml +++ b/chapter06/bin86-exp.xml @@ -1,13 +1,11 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>make INSTALL_OPTS="-m 755"...</userinput>: The Makefile +<para><userinput>make INSTALL_OPTS="-m 755"...</userinput>: The Makefile declares INSTALL_OPTS="-m 755 -s". The -s parameter causes the install program to invoke the strip program to strip debug symbols from the program. This doesn't work properly because a few files aren't -programs, but shell scripts. The strip program errors on those. -</para> +programs, but shell scripts. The strip program errors on those.</para> </sect2> diff --git a/chapter06/bin86-inst.xml b/chapter06/bin86-inst.xml index cb818beda..34f13b2d1 100644 --- a/chapter06/bin86-inst.xml +++ b/chapter06/bin86-inst.xml @@ -1,16 +1,10 @@ <sect2> <title>Installation of Bin86</title> -<para> -Install Bin86 by running the following commands: -</para> +<para>Install Bin86 by running the following commands:</para> -<para> -<screen> -<userinput>make &&</userinput> -<userinput>make PREFIX=/usr install</userinput> -</screen> -</para> +<para><screen><userinput>make &&</userinput> +<userinput>make PREFIX=/usr install</userinput></screen></para> </sect2> diff --git a/chapter06/bin86.xml b/chapter06/bin86.xml index 89e1c1a38..c2cf4166c 100644 --- a/chapter06/bin86.xml +++ b/chapter06/bin86.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-bin86"> <title>Installing Bin86</title> -<screen> -Estimated build time: &bin86-time; -Estimated disk space required: &bin86-compsize; -</screen> +<screen>Estimated build time: &bin86-time; +Estimated disk space required: &bin86-compsize;</screen> &c6-bin86-inst; &aa-bin86-desc; diff --git a/chapter06/binutils-inst.xml b/chapter06/binutils-inst.xml index f8ea0860a..1002d09c3 100644 --- a/chapter06/binutils-inst.xml +++ b/chapter06/binutils-inst.xml @@ -1,17 +1,11 @@ <sect2><title>Installation of Binutils</title> -<para> -Install Binutils by running the following commands: -</para> +<para>Install Binutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --enable-shared &&</userinput> +<para><screen><userinput>./configure --prefix=/usr --enable-shared &&</userinput> <userinput>make -e tooldir=/usr &&</userinput> <userinput>make -e tooldir=/usr install &&</userinput> -<userinput>make -e tooldir=/usr install-info</userinput> -</screen> -</para> +<userinput>make -e tooldir=/usr install-info</userinput></screen></para> </sect2> diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index 6747c7a78..58a07f9ab 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-binutils"> <title>Installing Binutils</title> -<screen> -Estimated build time: &binutils-time; -Estimated disk space required: &binutils-compsize; -</screen> +<screen>Estimated build time: &binutils-time; +Estimated disk space required: &binutils-compsize;</screen> &c6-binutils-inst; &aa-binutils-desc; diff --git a/chapter06/bison-exp.xml b/chapter06/bison-exp.xml index 250f345ce..2ba311845 100644 --- a/chapter06/bison-exp.xml +++ b/chapter06/bison-exp.xml @@ -1,10 +1,8 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>--datadir=/usr/share/bison:</userinput> This installs the -bison grammar files in /usr/share/bison rather than /usr/share. -</para> +<para><userinput>--datadir=/usr/share/bison:</userinput> This installs the +bison grammar files in /usr/share/bison rather than /usr/share.</para> </sect2> diff --git a/chapter06/bison-inst.xml b/chapter06/bison-inst.xml index 8d83c0bad..d196366f2 100644 --- a/chapter06/bison-inst.xml +++ b/chapter06/bison-inst.xml @@ -1,34 +1,22 @@ <sect2> <title>Installation of Bison</title> -<para> -Install Bison by running the following commands: -</para> +<para>Install Bison by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr \</userinput> +<para><screen><userinput>./configure --prefix=/usr \</userinput> <userinput> --datadir=/usr/share/bison &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> -<para> -Some programs don't know about bison and try to find the yacc program +<para>Some programs don't know about bison and try to find the yacc program (bison is a (better) alternative for yacc). So to please those few programs out there we'll create a yacc script that calls bison and have -it emulate yacc's output file name conventions). -</para> +it emulate yacc's output file name conventions).</para> -<para> -Create a new file <filename>/usr/bin/yacc</filename> by running the -following: -</para> +<para>Create a new file <filename>/usr/bin/yacc</filename> by running the +following:</para> -<para> -<screen> -<userinput>cat > /usr/bin/yacc << "EOF"</userinput> +<para><screen><userinput>cat > /usr/bin/yacc << "EOF"</userinput> #!/bin/sh # Begin /usr/bin/yacc @@ -36,9 +24,7 @@ following: # End /usr/bin/yacc <userinput>EOF</userinput> -<userinput>chmod 755 /usr/bin/yacc</userinput> -</screen> -</para> +<userinput>chmod 755 /usr/bin/yacc</userinput></screen></para> </sect2> diff --git a/chapter06/bison.xml b/chapter06/bison.xml index 790da35fb..417d18e72 100644 --- a/chapter06/bison.xml +++ b/chapter06/bison.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-bison"> <title>Installing Bison</title> -<screen> -Estimated build time: &bison-time; -Estimated disk space required: &bison-compsize; -</screen> +<screen>Estimated build time: &bison-time; +Estimated disk space required: &bison-compsize;</screen> &c6-bison-inst; &c6-bison-exp; diff --git a/chapter06/bzip2-exp.xml b/chapter06/bzip2-exp.xml index 99eded1d5..327455c97 100644 --- a/chapter06/bzip2-exp.xml +++ b/chapter06/bzip2-exp.xml @@ -1,19 +1,15 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>make -f Makefile-libbz2_so:</userinput> This will cause bzip2 +<para><userinput>make -f Makefile-libbz2_so:</userinput> This will cause bzip2 to be build using a different Makefile file, in this case the Makefile-libbz2_so file which creates a dynamic libbz2.so library and -links the bzip2 utilities against it. -</para> +links the bzip2 utilities against it.</para> -<para> -The reason we don't use <userinput>make install</userinput> is that +<para>The reason we don't use <userinput>make install</userinput> is that bzip2's make install doesn't install the shared libbz2.so, nor the bzip2 binary that's linked against that library. So we have no choice but to -manually install the files. -</para> +manually install the files.</para> </sect2> diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml index 8a9cc2880..551818ac2 100644 --- a/chapter06/bzip2-inst.xml +++ b/chapter06/bzip2-inst.xml @@ -1,13 +1,9 @@ <sect2> <title>Installation of Bzip2</title> -<para> -Install Bzip2 by running the following commands: -</para> +<para>Install Bzip2 by running the following commands:</para> -<para> -<screen> -<userinput>make -f Makefile-libbz2_so &&</userinput> +<para><screen><userinput>make -f Makefile-libbz2_so &&</userinput> <userinput>make bzip2recover libbz2.a &&</userinput> <userinput>cp bzip2-shared /bin/bzip2 &&</userinput> <userinput>cp bzip2recover /bin &&</userinput> @@ -21,20 +17,16 @@ Install Bzip2 by running the following commands: <userinput>cd /usr/share/man/man1 &&</userinput> <userinput>ln -s bzip2.1 bunzip2.1 &&</userinput> <userinput>ln -s bzip2.1 bzcat.1 &&</userinput> -<userinput>ln -s bzip2.1 bzip2recover.1</userinput> -</screen> -</para> +<userinput>ln -s bzip2.1 bzip2recover.1</userinput></screen></para> -<para> -Although it's not strictly a part of a basic LFS system it's worth +<para>Although it's not strictly a part of a basic LFS system it's worth mentioning that a patch for Tar can be downloaded which enables the tar program to compress and uncompress using bzip2/bunzip2 easily. With a plain tar a user has to use constructions like bzcat file.tar.bz|tar xv or tar --use-compress-prog=bunzip2 -xvf file.tar.bz2 to use bzip2 and bunzip2 with tar. This patch gives the -y option so a user can unpack a Bzip2 archive with tar xvfy file.tar.bz2. Applying this patch will be -mentioned later on when the Tar package is re-installed. -</para> +mentioned later on when the Tar package is re-installed.</para> </sect2> diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml index dade55e31..7dd130375 100644 --- a/chapter06/bzip2.xml +++ b/chapter06/bzip2.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-bzip2"> <title>Installing Bzip2</title> -<screen> -Estimated build time: &bzip2-time; -Estimated disk space required: &bzip2-compsize; -</screen> +<screen>Estimated build time: &bzip2-time; +Estimated disk space required: &bzip2-compsize;</screen> &c6-bzip2-inst; &c6-bzip2-exp; diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml index c025085dd..59c312f03 100644 --- a/chapter06/chroot.xml +++ b/chapter06/chroot.xml @@ -1,47 +1,33 @@ <sect1 id="ch06-chroot"> <title>Entering the chroot'ed environment</title> -<para> -It's time to enter our chroot'ed environment in order to install the -rest of the software we need. -</para> +<para>It's time to enter our chroot'ed environment in order to install the +rest of the software we need.</para> -<para> -Enter the following commands to enter the chroot'ed environment. From +<para>Enter the following commands to enter the chroot'ed environment. From this point on there's no need to use the $LFS variable anymore, because everything a user does will be restricted to the LFS partition (since / is -actually /mnt/lfs but the shell doesn't know that). -</para> +actually /mnt/lfs but the shell doesn't know that).</para> -<para> -<screen> -&c6-chrootcmd; -</screen> -</para> +<para><screen>&c6-chrootcmd;</screen></para> -<para> -The -i option will clear all environment variables for as long as you +<para>The -i option will clear all environment variables for as long as you are in the chroot'ed environment and only the ROOT and TERM variables are rest. The TERM=$TERM construction will set the $TERM value inside chroot to the same value as outside chroot which is needed for programs like vim and less to operate properly. If you need other variables -present, such as CFLAGS or CXXFLAGS, you need to set them again. -</para> +present, such as CFLAGS or CXXFLAGS, you need to set them again.</para> -<para> -Now that we are inside a chroot'ed environment, we can continue to +<para>Now that we are inside a chroot'ed environment, we can continue to install all the basic system software. You have to make sure all the following commands in this and following chapters are run from within the chroot'ed environment. If you ever leave this environment for any reason (when rebooting for example) please remember to mount $LFS/proc again and re-enter chroot before continuing with the -book. -</para> +book.</para> -<para> -Note that the bash prompt will contain "I have no name!" This is -normal because Glibc hasn't been installed yet. -</para> +<para>Note that the bash prompt will contain "I have no name!" This is +normal because Glibc hasn't been installed yet.</para> </sect1> diff --git a/chapter06/config-glibc.xml b/chapter06/config-glibc.xml index f5b9787da..3c5fb97ce 100644 --- a/chapter06/config-glibc.xml +++ b/chapter06/config-glibc.xml @@ -1,20 +1,14 @@ <sect2><title>Configuring Glibc</title> -<para> -We need to create the /etc/nsswitch.conf file. Although glibc should provide -defaults when this file is missing or corrupt, it's defaults don't work +<para>We need to create the /etc/nsswitch.conf file. Although glibc should +provide defaults when this file is missing or corrupt, it's defaults don't work well with networking which will be dealt with in a later chapter. Also, our -timezone needs to be setup. -</para> +timezone needs to be setup.</para> -<para> -Create a new file <filename>/etc/nsswitch.conf</filename> by running the -following: -</para> +<para>Create a new file <filename>/etc/nsswitch.conf</filename> by running the +following:</para> -<para> -<screen> -<userinput>cat > /etc/nsswitch.conf << "EOF"</userinput> +<para><screen><userinput>cat > /etc/nsswitch.conf << "EOF"</userinput> # Begin /etc/nsswitch.conf passwd: files @@ -34,53 +28,29 @@ rpc: db files netgroup: db files # End /etc/nsswitch.conf -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> -<para> -The <userinput>tzselect</userinput> script has to be run and the questions -regarding your timezone have to be answered. +<para>The <userinput>tzselect</userinput> script has to be run and the +questions regarding your timezone have to be answered. When you're done, the script will give the -location of the needed timezone file. -</para> - -<para> -Create the <filename class="directory">/etc/localtime</filename> symlink -by running: -</para> - -<para> -<screen> -<userinput>cd /etc &&</userinput> -<userinput>ln -sf ../usr/share/zoneinfo/<tzselect's output> localtime</userinput> -</screen> -</para> - -<para> -tzselect's output can be something like <emphasis>EST5EDT</emphasis> or -<emphasis>Canada/Eastern</emphasis>. -</para> - -<para> -The symlink you'd create with that information would be: -</para> - -<para> -<screen> -<userinput>ln -sf ../usr/share/zoneinfo/EST5EDT localtime</userinput> -</screen> -</para> - -<para> -Or: -</para> - -<para> -<screen> -<userinput>ln -sf ../usr/share/zoneinfo/Canada/Eastern localtime </userinput> -</screen> -</para> +location of the needed timezone file.</para> + +<para> Create the <filename class="directory">/etc/localtime</filename> symlink +by running:</para> + +<para><screen><userinput>cd /etc &&</userinput> +<userinput>ln -sf ../usr/share/zoneinfo/<tzselect's output> localtime</userinput></screen></para> + +<para>tzselect's output can be something like <emphasis>EST5EDT</emphasis> or +<emphasis>Canada/Eastern</emphasis>.</para> + +<para>The symlink you'd create with that information would be:</para> + +<para><screen><userinput>ln -sf ../usr/share/zoneinfo/EST5EDT localtime</userinput></screen></para> + +<para>Or:</para> + +<para><screen><userinput>ln -sf ../usr/share/zoneinfo/Canada/Eastern localtime </userinput></screen></para> </sect2> diff --git a/chapter06/config-ldso.xml b/chapter06/config-ldso.xml index 04fb4960e..7bb4768e8 100644 --- a/chapter06/config-ldso.xml +++ b/chapter06/config-ldso.xml @@ -1,25 +1,19 @@ <sect2> <title>Configuring Dynamic Loader</title> -<para> -By default the dynamic loader searches a few default paths for dynamic +<para>By default the dynamic loader searches a few default paths for dynamic libraries, so there normally isn't a need for the <filename>/etc/ld.so.conf</filename> file unless the system has extra directories in which a user wants the system to search for paths. The <filename class="directory">/usr/local/lib</filename> directory isn't searched through for dynamic libraries by default, so we want to add this path so when you install software you won't be surprised by them not -running for some reason. -</para> +running for some reason.</para> -<para> -Create a new file <filename>/etc/ld.so.conf</filename> by running the -following: -</para> +<para>Create a new file <filename>/etc/ld.so.conf</filename> by running the +following:</para> -<para> -<screen> -<userinput>cat > /etc/ld.so.conf << "EOF"</userinput> +<para><screen><userinput>cat > /etc/ld.so.conf << "EOF"</userinput> # Begin /etc/ld.so.conf /lib @@ -27,17 +21,13 @@ following: /usr/local/lib # End /etc/ld.so.conf -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> -<para> -Although it's not necessary to add the +<para>Although it's not necessary to add the <filename class="directory">/lib</filename> and <filename class="directory">/usr/lib</filename> directories it doesn't hurt. This way it can be seen right away what's being searched and a you -don't have to remember the default search paths if you don't want to. -</para> +don't have to remember the default search paths if you don't want to.</para> </sect2> diff --git a/chapter06/config-shadowpwd.xml b/chapter06/config-shadowpwd.xml index 8202c12bb..e3b0237c9 100644 --- a/chapter06/config-shadowpwd.xml +++ b/chapter06/config-shadowpwd.xml @@ -1,25 +1,17 @@ <sect2><title>Configuring Shadow Password Suite</title> -<para> -This package contains the utilities to modify user's passwords, add new +<para>This package contains the utilities to modify user's passwords, add new users/groups, delete users/groups and more. We're not going to explain what 'password shadowing' means. All about that can be read in the doc/HOWTO file within the unpacked shadow password suite's source tree. There's one thing you should keep in mind, if you decide to use shadow support, that programs that need to verify passwords (examples are xdm, ftp daemons, pop3 daemons, etc) need to be 'shadow-compliant', eg. they need to -be able to work with shadow'ed passwords. -</para> +be able to work with shadow'ed passwords.</para> -<para> -To enable shadow'ed passwords, run the following command: -</para> +<para>To enable shadow'ed passwords, run the following command:</para> -<para> -<screen> -<userinput>/usr/sbin/pwconv</userinput> -</screen> -</para> +<para><screen><userinput>/usr/sbin/pwconv</userinput></screen></para> </sect2> diff --git a/chapter06/config-sysklogd.xml b/chapter06/config-sysklogd.xml index 3b52725e3..37ca8fbdd 100644 --- a/chapter06/config-sysklogd.xml +++ b/chapter06/config-sysklogd.xml @@ -1,13 +1,9 @@ <sect2><title>Configuring Sysklogd</title> -<para> -Create a new file <filename>/etc/syslog.conf</filename> by running the -following: -</para> +<para>Create a new file <filename>/etc/syslog.conf</filename> by running the +following:</para> -<para> -<screen> -<userinput>cat > /etc/syslog.conf << "EOF"</userinput> +<para><screen><userinput>cat > /etc/syslog.conf << "EOF"</userinput> # Begin /etc/syslog.conf auth,authpriv.* -/var/log/auth.log @@ -19,9 +15,7 @@ user.* -/var/log/user.log *.emerg * # End /etc/syslog.conf -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect2> diff --git a/chapter06/config-sysvinit.xml b/chapter06/config-sysvinit.xml index bbb2ae51a..11f0ffabd 100644 --- a/chapter06/config-sysvinit.xml +++ b/chapter06/config-sysvinit.xml @@ -1,13 +1,9 @@ <sect2><title>Configuring Sysvinit</title> -<para> -Create a new file <filename>/etc/inittab</filename> by running the -following: -</para> - -<para> -<screen> -<userinput>cat > /etc/inittab << "EOF"</userinput> +<para>Create a new file <filename>/etc/inittab</filename> by running the +following:</para> + +<para><screen><userinput>cat > /etc/inittab << "EOF"</userinput> # Begin /etc/inittab id:3:initdefault: @@ -34,9 +30,7 @@ su:S016:respawn:/sbin/sulogin 6:2345:respawn:/sbin/agetty tty6 9600 # End /etc/inittab -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect2> diff --git a/chapter06/config-vim.xml b/chapter06/config-vim.xml index 172d67ffc..ee4124a2f 100644 --- a/chapter06/config-vim.xml +++ b/chapter06/config-vim.xml @@ -1,24 +1,18 @@ <sect2><title>Configuring Vim</title> -<para> -By default Vim runs in vi compatible mode. Some people might like this, +<para>By default Vim runs in vi compatible mode. Some people might like this, but we have a high preference to run vim in vim mode (else we wouldn't have included Vim in this book but the original Vi). Create the -<filename>/root/.vimrc</filename> by running the following: -</para> +<filename>/root/.vimrc</filename> by running the following:</para> -<para> -<screen> -<userinput>cat > /root/.vimrc << "EOF"</userinput> +<para><screen><userinput>cat > /root/.vimrc << "EOF"</userinput> " Begin /root/.vimrc set nocompatible set bs=2 " End /root/.vimrc -<userinput>EOF</userinput> -</screen> -</para> +<userinput>EOF</userinput></screen></para> </sect2> diff --git a/chapter06/configure.xml b/chapter06/configure.xml index 207597b95..2487f3536 100644 --- a/chapter06/configure.xml +++ b/chapter06/configure.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-configure"> <title>Configuring essential software</title> -<para> -Now that all software is installed, all that we need to do to get a few -programs running properly is to create their configuration files. -</para> +<para>Now that all software is installed, all that we need to do to get a few +programs running properly is to create their configuration files.</para> &c6-cf-vim; &c6-cf-glibc; diff --git a/chapter06/create-password.xml b/chapter06/create-password.xml index 7bbde76f9..d8e182d5f 100644 --- a/chapter06/create-password.xml +++ b/chapter06/create-password.xml @@ -1,16 +1,10 @@ <sect2> <title>Creating root password</title> -<para> -Choose a password for user root and create it by running the following -command: -</para> +<para>Choose a password for user root and create it by running the following +command:</para> -<para> -<screen> -<userinput>passwd root</userinput> -</screen> -</para> +<para><screen><userinput>passwd root</userinput></screen></para> </sect2> diff --git a/chapter06/create-utmp.xml b/chapter06/create-utmp.xml index 93a94fb75..3c8dcd756 100644 --- a/chapter06/create-utmp.xml +++ b/chapter06/create-utmp.xml @@ -2,27 +2,19 @@ <title>Creating the /var/run/utmp, /var/log/wtmp and /var/log/btmp files</title> -<para> -Programs like login, shutdown, uptime and others want to read from and write -to the /var/run/utmp /var/log/btmp and /var/log/wtmp. These files contain +<para>Programs like login, shutdown, uptime and others want to read from and +write to the /var/run/utmp /var/log/btmp and /var/log/wtmp. These files contain information about who is currently logged in. It also contains information on when the computer was last booted and shutdown and a record of the -bad login attempts. -</para> +bad login attempts.</para> -<para> -Create these files with their proper permissions by running the -following commands: -</para> +<para>Create these files with their proper permissions by running the +following commands:</para> -<para> -<screen> -<userinput>touch /var/run/utmp /var/log/wtmp \</userinput> +<para><screen><userinput>touch /var/run/utmp /var/log/wtmp \</userinput> <userinput> /var/log/btmp /var/log/lastlog &&</userinput> <userinput>chmod 644 /var/run/utmp /var/log/wtmp \</userinput> -<userinput> /var/log/btmp /var/log/lastlog</userinput> -</screen> -</para> +<userinput> /var/log/btmp /var/log/lastlog</userinput></screen></para> </sect2> diff --git a/chapter06/diffutils-inst.xml b/chapter06/diffutils-inst.xml index 7b3bf5ecd..527866a22 100644 --- a/chapter06/diffutils-inst.xml +++ b/chapter06/diffutils-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Diffutils</title> -<para> -Install Diffutils by running the following commands: -</para> +<para>Install Diffutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml index d11ba845e..13e39bb68 100644 --- a/chapter06/diffutils.xml +++ b/chapter06/diffutils.xml @@ -1,10 +1,8 @@ <sect1 id="diffutils"> <title>Installing Diffutils</title> -<screen> -Estimated build time: &diffutils-time; -Estimated disk space required: &diffutils-compsize; -</screen> +<screen>Estimated build time: &diffutils-time; +Estimated disk space required: &diffutils-compsize;</screen> &c6-diffutils-inst; &aa-diffutils-desc; diff --git a/chapter06/e2fsprogs-inst.xml b/chapter06/e2fsprogs-inst.xml index 39c263be4..4843a3554 100644 --- a/chapter06/e2fsprogs-inst.xml +++ b/chapter06/e2fsprogs-inst.xml @@ -1,25 +1,17 @@ <sect2> <title>Installation of E2fsprogs</title> -<para> -Install E2fsprogs by running the following commands: -</para> +<para>Install E2fsprogs by running the following commands:</para> -<para> -Please note that the empty --with-root-prefix= option below is supposed -to be like this. We did not forget to supply a value there. -</para> +<para>Please note that the empty --with-root-prefix= option below is supposed +to be like this. We did not forget to supply a value there.</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --with-root-prefix= \</userinput> +<para><screen><userinput>./configure --prefix=/usr --with-root-prefix= \</userinput> <userinput> --enable-elf-shlibs &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>make install-libs &&</userinput> -<userinput>mv /usr/sbin/mklost+found /sbin</userinput> -</screen> -</para> +<userinput>mv /usr/sbin/mklost+found /sbin</userinput></screen></para> </sect2> diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 6c25f63ff..d9921b7ed 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-e2fsprogs"> <title>Installing E2fsprogs</title> -<screen> -Estimated build time: &e2fsprogs-time; -Estimated disk space required: &e2fsprogs-compsize; -</screen> +<screen>Estimated build time: &e2fsprogs-time; +Estimated disk space required: &e2fsprogs-compsize;</screen> &c6-e2fsprogs-inst; &aa-e2fsprogs-desc; diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml index 8c582413f..4e896a9cc 100644 --- a/chapter06/ed-inst.xml +++ b/chapter06/ed-inst.xml @@ -1,18 +1,12 @@ <sect2> <title>Installation of Ed</title> -<para> -Install Ed by running the following commands: -</para> +<para>Install Ed by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>mv /usr/bin/ed /usr/bin/red /bin</userinput> -</screen> -</para> +<userinput>mv /usr/bin/ed /usr/bin/red /bin</userinput></screen></para> </sect2> diff --git a/chapter06/ed.xml b/chapter06/ed.xml index 3ac799728..c43bc1f12 100644 --- a/chapter06/ed.xml +++ b/chapter06/ed.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-ed"> <title>Installing Ed</title> -<screen> -Estimated build time: &ed-time; -Estimated disk space required: &ed-compsize; -</screen> +<screen>Estimated build time: &ed-time; +Estimated disk space required: &ed-compsize;</screen> &c6-ed-inst; &aa-ed-desc; diff --git a/chapter06/file-inst.xml b/chapter06/file-inst.xml index 0a084a542..f300117e4 100644 --- a/chapter06/file-inst.xml +++ b/chapter06/file-inst.xml @@ -1,22 +1,16 @@ <sect2> <title>Installation of File</title> -<para> -Install File by running the following commands: -</para> +<para>Install File by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --datadir=/usr/share/misc &&</userinput> +<para><screen><userinput>./configure --prefix=/usr --datadir=/usr/share/misc &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> -<para> -File uses magic numbers to determine a file type. These magic numbers come with -File in a plain text file. File internally compiles this database each time it -is run. This is not the normal type of operation for File since compiling a +<para>File uses magic numbers to determine a file type. These magic numbers +come with File in a plain text file. File internally compiles this database +each time it is run. This is not the normal type of operation for File since +compiling a plain text file each time is not the fastest way to do it. File offers an option "-C" to compile this magic number file. The reason this isn't done automatically is that some people like to work on the magic numbers. On the @@ -24,14 +18,9 @@ other hand many people didn't get it that they should compile the magic numbers, so the author of File added a warning when the plain text magic file is used. As we usually won't work on the plain text magic file, we compile this file, because it's faster, fixes that annoying warning and is how -it was meant to be: -</para> +it was meant to be:</para> -<para> -<screen> -<userinput>file -C</userinput> -</screen> -</para> +<para><screen><userinput>file -C</userinput></screen></para> </sect2> diff --git a/chapter06/file.xml b/chapter06/file.xml index 9125c8f2f..ed2d3a9df 100644 --- a/chapter06/file.xml +++ b/chapter06/file.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-file"> <title>Installing File</title> -<screen> -Estimated build time: &file-time; -Estimated disk space required: &file-compsize; -</screen> +<screen>Estimated build time: &file-time; +Estimated disk space required: &file-compsize;</screen> &c6-file-inst; &aa-file-desc; diff --git a/chapter06/fileutils-inst.xml b/chapter06/fileutils-inst.xml index aa882500c..4374d77b7 100644 --- a/chapter06/fileutils-inst.xml +++ b/chapter06/fileutils-inst.xml @@ -1,18 +1,12 @@ <sect2> <title>Installation of Fileutils</title> -<para> -Install Fileutils by running the following commands: -</para> +<para>Install Fileutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --bindir=/bin \</userinput> +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin \</userinput> <userinput> --libexecdir=/bin &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/fileutils.xml b/chapter06/fileutils.xml index 6929da0eb..a3a2fea84 100644 --- a/chapter06/fileutils.xml +++ b/chapter06/fileutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-fileutils"> <title>Installing Fileutils</title> -<screen> -Estimated build time: &fileutils-time; -Estimated disk space required: &fileutils-compsize; -</screen> +<screen>Estimated build time: &fileutils-time; +Estimated disk space required: &fileutils-compsize;</screen> &c6-fileutils-inst; &aa-fileutils-desc; diff --git a/chapter06/findutils-inst.xml b/chapter06/findutils-inst.xml index 167930c3a..ea032aa63 100644 --- a/chapter06/findutils-inst.xml +++ b/chapter06/findutils-inst.xml @@ -1,22 +1,15 @@ <sect2> <title>Installing Findutils</title> -<para> -Before Findutils is installed the findutils patch file has to be unpacked. -</para> +<para>Before Findutils is installed the findutils patch file has +to be unpacked.</para> -<para> -Install Findutils by running the following commands: -</para> +<para>Install Findutils by running the following commands:</para> -<para> -<screen> -<userinput>patch -Np1 -i ../findutils-4.1.patch &&</userinput> +<para><screen><userinput>patch -Np1 -i ../findutils-4.1.patch &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make libexecdir=/usr/bin install</userinput> -</screen> -</para> +<userinput>make libexecdir=/usr/bin install</userinput></screen></para> </sect2> diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index 8e5d11660..2567d3c17 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-findutils"> <title>Installing Findutils</title> -<screen> -Estimated build time: &findutils-time; -Estimated disk space required: &findutils-compsize; -</screen> +<screen>Estimated build time: &findutils-time; +Estimated disk space required: &findutils-compsize;</screen> &c6-findutils-inst; &aa-findutils-desc; diff --git a/chapter06/flex-inst.xml b/chapter06/flex-inst.xml index efe1801bc..fedd2dc5e 100644 --- a/chapter06/flex-inst.xml +++ b/chapter06/flex-inst.xml @@ -1,19 +1,13 @@ <sect2> <title>Installation of Flex</title> -<para> -Install Flex by running the following commands: -</para> +<para>Install Flex by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>ln -s flex lex</userinput> -</screen> -</para> +<userinput>ln -s flex lex</userinput></screen></para> </sect2> diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 2c8ea0647..07257cf35 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-flex"> <title>Installing Flex</title> -<screen> -Estimated build time: &flex-time; -Estimated disk space required: &flex-compsize; -</screen> +<screen>Estimated build time: &flex-time; +Estimated disk space required: &flex-compsize;</screen> &c6-flex-inst; &aa-flex-desc; diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml index c4d77b0af..97e64cc2c 100644 --- a/chapter06/gcc-inst.xml +++ b/chapter06/gcc-inst.xml @@ -1,31 +1,23 @@ <sect2> <title>Installation of GCC</title> -<para> -Install GCC by running the following commands. These commands will build +<para>Install GCC by running the following commands. These commands will build the C and C++ compiler. Other compilers are available within the gcc package. If you want to build all the other availble compilers too, leave out the --enable-languages=c,c++ option in the configure command. See the GCC documentation for more details on which additional compilers -are available. -</para> +are available.</para> -<para> -Note: the build of other compilers is not tested by the people -who actively work on LFS. -</para> +<para>Note: the build of other compilers is not tested by the people +who actively work on LFS.</para> -<para> -<screen> -<userinput>mkdir ../gcc-build &&</userinput> +<para><screen><userinput>mkdir ../gcc-build &&</userinput> <userinput>cd ../gcc-build &&</userinput> <userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput> <userinput> --with-slibdir=/lib --enable-shared \</userinput> <userinput> --enable-languages=c,c++ &&</userinput> <userinput>make bootstrap &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 654292101..0c85e10b3 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-gcc"> <title>Installing GCC</title> -<screen> -Estimated build time: &gcc-time; -Estimated disk space required: &gcc-compsize; -</screen> +<screen>Estimated build time: &gcc-time; +Estimated disk space required: &gcc-compsize;</screen> &c6-gcc-inst; &aa-gcc-desc; diff --git a/chapter06/gettext-inst.xml b/chapter06/gettext-inst.xml index 25f3f58fa..384ced5c5 100644 --- a/chapter06/gettext-inst.xml +++ b/chapter06/gettext-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Gettext</title> -<para> -Install Gettext by running the following commands: -</para> +<para>Install Gettext by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml index 5912a9313..96a2f17fe 100644 --- a/chapter06/gettext.xml +++ b/chapter06/gettext.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-gettext"> <title>Installing Gettext</title> -<screen> -Estimated build time: &gettext-time; -Estimated disk space required: &gettext-compsize; -</screen> +<screen>Estimated build time: &gettext-time; +Estimated disk space required: &gettext-compsize;</screen> &c6-gettext-inst; &aa-gettext-desc; diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml index 05803155a..36eb6864c 100644 --- a/chapter06/glibc-exp.xml +++ b/chapter06/glibc-exp.xml @@ -1,62 +1,48 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>mknod -m 0666 /dev/null c 1 3:</userinput> Glibc needs a +<para><userinput>mknod -m 0666 /dev/null c 1 3:</userinput> Glibc needs a null device to compile properly. All other devices will be created in the -next section. -</para> +next section.</para> -<para> -<userinput>touch /etc/ld.so.conf</userinput> One of the final steps of +<para><userinput>touch /etc/ld.so.conf</userinput> One of the final steps of the Glibc installation is running ldconfig to update the dynamic loader cache. If this file isn't present Glibc will abort with an error that it can't read the file. So we create an empty file for it (the empty file -will have Glibc default to using /lib and /usr/lib which is fine right now). -</para> +will have Glibc default to using /lib and +/usr/lib which is fine right now).</para> -<para> -<userinput>sed s/"\$(PERL)"/"\/usr\/bin\/perl"/ +<para><userinput>sed s/"\$(PERL)"/"\/usr\/bin\/perl"/ ../glibc-2.2.3/malloc/Makefile > tmp~:</userinput> This sed command searches through <filename>../glibc-2.2.3/malloc/Makefile</filename> and converts all occurances of <filename>$(PERL)</filename> to <filename>/usr/bin/perl</filename>. The output is then written to the file <filename>tmp~</filename>. This is done because Glibc can't autodetect perl since it's not installed yet at the time when we install -Glibc. -</para> +Glibc.</para> -<para> -<userinput>mv tmp~ ../glibc-2.2.3/malloc/Makefile:</userinput> The file +<para><userinput>mv tmp~ ../glibc-2.2.3/malloc/Makefile:</userinput> The file <filename>tmp~</filename> is now moved back to <filename>../glibc-2.2.3/malloc/Makefile</filename>. We do this because when using sed, we can't write straight back to this file so we need to -use a temporary file in between. -</para> +use a temporary file in between.</para> -<para> -<userinput>sed "s/root/0" ../glibc-2.2.3/login/Makefile > +<para><userinput>sed "s/root/0" ../glibc-2.2.3/login/Makefile > tmp~:</userinput> This sed command replaces all occurances of <filename>root</filename> in <filename>../glibc-2.2.3/login/Makefile</filename> with 0. This is because as we don't have glibc on the LFS system yet, usernames can't be resolved to their user id's. Therefore, we replace the username -root with the id 0. -</para> +root with the id 0. </para> -<para> -<userinput>mv tmp~ ../glibc-2.2.3/login/Makefile:</userinput> As above, +<para><userinput>mv tmp~ ../glibc-2.2.3/login/Makefile:</userinput> As above, we are using a temporary file (<filename>tmp~</filename>) to store the -edited Makefile and then copying it back over the original. -</para> +edited Makefile and then copying it back over the original.</para> -<para> -<userinput>--enable-add-ons:</userinput> This enables the add-on that -we install with Glibc: linuxthreads -</para> +<para><userinput>--enable-add-ons:</userinput> This enables the add-on that +we install with Glibc: linuxthreads</para> -<para> -<userinput>sed s/"cross-compiling = yes"/"cross-compiling = no"/ +<para><userinput>sed s/"cross-compiling = yes"/"cross-compiling = no"/ config.make > config.make~:</userinput> This time, we're replacing <filename>cross-compiling = yes</filename> with <filename>cross-compiling = no</filename>. We do this because we are @@ -65,13 +51,10 @@ instance, to build a package for an Apple Power PC on an Intel system. The reason Glibc thinks we're cross-compiling is that it can't compile a test program to determin this, so it automatically default to a cross-compiler. The reason for the failed program is because Glibc -hasn't been installed yet. -</para> +hasn't been installed yet.</para> -<para> -<userinput>mv config.make~ config.make:</userinput> Again, we are moving -the temporary file over the original. -</para> +<para><userinput>mv config.make~ config.make:</userinput> Again, we are moving +the temporary file over the original.</para> </sect2> diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index c83cd5779..a280f91d0 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -1,20 +1,14 @@ <sect2> <title>Installation of Glibc</title> -<para> -Once glibc has been unpacked as usual and you have cd'ed into the +<para>Once glibc has been unpacked as usual and you have cd'ed into the glibc-&glibc-version; directory, unpack glibc-linuxthreads inside the glibc-&glibc-version; directory, not in /usr/src as you normally -would do. -</para> +would do.</para> -<para> -Install Glibc by running the following commands: -</para> +<para>Install Glibc by running the following commands:</para> -<para> -<screen> -<userinput>mknod -m 0666 /dev/null c 1 3 &&</userinput> +<para><screen><userinput>mknod -m 0666 /dev/null c 1 3 &&</userinput> <userinput>touch /etc/ld.so.conf &&</userinput> <userinput>mkdir ../glibc-build &&</userinput> <userinput>cd ../glibc-build &&</userinput> @@ -31,46 +25,30 @@ Install Glibc by running the following commands: <userinput>mv config.make~ config.make &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>make localedata/install-locales</userinput> -</screen> -</para> +<userinput>make localedata/install-locales</userinput></screen></para> -<para> -During the configure stage you will see the following warning: -</para> +<para>During the configure stage you will see the following warning:</para> -<blockquote><screen> -configure: warning: +<blockquote><screen>configure: warning: *** An auxiliary program is missing or too old; *** some features will be disabled. -*** Check the INSTALL file for required versions. -</screen></blockquote> +*** Check the INSTALL file for required versions.</screen></blockquote> -<para> -This warning refers to the missing msgfmt program from the gettext +<para>This warning refers to the missing msgfmt program from the gettext package. But there is nothing to worry about: Glib will still be installed the same way as when msgfmt is present. It can safely be -ignored in our case. -</para> +ignored in our case.</para> -<para> -By exiting the chroot'ed environment and re-entering it, you will be +<para>By exiting the chroot'ed environment and re-entering it, you will be able to get rid of the "I have no name!" message in the command prompt, which is caused by bash's inability to resolve a userid to a username. You don't have to exit and re-enter chroot, but it's highly recommended -to ensure a properly working bash. -</para> +to ensure a properly working bash.</para> -<para> -Run the following commands to accomplish this: -</para> +<para>Run the following commands to accomplish this:</para> -<para> -<screen> -<userinput>logout</userinput> -&c6-chrootcmd; -</screen> -</para> +<para><screen><userinput>logout</userinput> +&c6-chrootcmd;</screen></para> </sect2> diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index b6a0152ea..0440191e5 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-glibc"> <title>Installing Glibc</title> -<screen> -Estimated build time: &glibc-time; -Estimated disk space required: &glibc-compsize; -</screen> +<screen>Estimated build time: &glibc-time; +Estimated disk space required: &glibc-compsize;</screen> &c6-glibc-inst; &c6-glibc-exp; diff --git a/chapter06/grep-inst.xml b/chapter06/grep-inst.xml index 477df7476..43dababa1 100644 --- a/chapter06/grep-inst.xml +++ b/chapter06/grep-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Grep</title> -<para> -Install Grep by running the following commands: -</para> +<para>Install Grep by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/grep.xml b/chapter06/grep.xml index 354545858..341fa4cae 100644 --- a/chapter06/grep.xml +++ b/chapter06/grep.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-grep"> <title>Installing Grep</title> -<screen> -Estimated build time: &grep-time; -Estimated disk space required: &grep-compsize; -</screen> +<screen>Estimated build time: &grep-time; +Estimated disk space required: &grep-compsize;</screen> &c6-grep-inst; &aa-grep-desc; diff --git a/chapter06/groff-inst.xml b/chapter06/groff-inst.xml index 5a00d4fd8..7f7d16fad 100644 --- a/chapter06/groff-inst.xml +++ b/chapter06/groff-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Groff</title> -<para> -Install Groff by running the following commands: -</para> +<para>Install Groff by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/groff.xml b/chapter06/groff.xml index 7228dbbb6..e32cdd7e7 100644 --- a/chapter06/groff.xml +++ b/chapter06/groff.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-groff"> <title>Installing Groff</title> -<screen> -Estimated build time: &groff-time; -Estimated disk space required: &groff-compsize; -</screen> +<screen>Estimated build time: &groff-time; +Estimated disk space required: &groff-compsize;</screen> &c6-groff-inst; &aa-groff-desc; diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml index 08b03a3a7..5c59c88c1 100644 --- a/chapter06/gzip-inst.xml +++ b/chapter06/gzip-inst.xml @@ -1,13 +1,9 @@ <sect2> <title>Installation of Gzip</title> -<para> -Install Gzip by running the following commands: -</para> +<para>Install Gzip by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> @@ -17,9 +13,7 @@ Install Gzip by running the following commands: <userinput>ln -sf gzip gunzip &&</userinput> <userinput>ln -s gzip zcat &&</userinput> <userinput>ln -s gzip compress &&</userinput> -<userinput>ln -s gunzip uncompress</userinput> -</screen> -</para> +<userinput>ln -s gunzip uncompress</userinput></screen></para> </sect2> diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml index 9ce0e3ee2..cdf1d7385 100644 --- a/chapter06/gzip.xml +++ b/chapter06/gzip.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-gzip"> <title>Installing Gzip</title> -<screen> -Estimated build time: &gzip-time; -Estimated disk space required: &gzip-compsize; -</screen> +<screen>Estimated build time: &gzip-time; +Estimated disk space required: &gzip-compsize;</screen> &c6-gzip-inst; &aa-gzip-desc; diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml index 3c3c68ee6..f915875aa 100644 --- a/chapter06/introduction.xml +++ b/chapter06/introduction.xml @@ -1,26 +1,21 @@ <sect1 id="ch06-introduction"> <title>Introduction</title> -<para> -The installation of all the software is pretty straightforward and +<para>The installation of all the software is pretty straightforward and you will probably think it's so much easier and shorter to give the generic installation instructions for each package and only explain how to install something if a certain package requires an alternate installation method. Although I agree on that, I choose to give the full instructions for each and every package. This is simply to avoid any -possible confusion and errors. -</para> +possible confusion and errors.</para> -<para> -Now would be a good time to take a look at the optimization hint at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/optimization.txt"> -http://archive.linuxfromscratch.org/lfs-hints/optimization.txt</ulink> +<para>Now would be a good time to take a look at the optimization hint at <ulink +url="http://archive.linuxfromscratch.org/lfs-hints/optimization.txt">http://archive.linuxfromscratch.org/lfs-hints/optimization.txt</ulink> if you plan on using compiler optimization for the packages installed in the following chapter. Compiler optimization can make a program run faster, but may also cause some compilation problems. If you run into problems after having used optimization, always try it without optimizing to see if you -can reproduce the problem. -</para> +can reproduce the problem.</para> </sect1> diff --git a/chapter06/kbd-exp.xml b/chapter06/kbd-exp.xml index 3fa90eb34..e00d4b751 100644 --- a/chapter06/kbd-exp.xml +++ b/chapter06/kbd-exp.xml @@ -1,23 +1,18 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>--datadir=/usr/share/kbd:</userinput> This puts the kbd data files -(fonts, keymaps, and such) in the /usr/share/kbd directory, as the FHS -suggests. -</para> +<para><userinput>--datadir=/usr/share/kbd:</userinput> This puts the kbd +data files (fonts, keymaps, and such) in the /usr/share/kbd directory, as +the FHS suggests.</para> -<para> -<userinput>rm +<para><userinput>rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz:</userinput> We -remove this file because we don't know which keymap you need to use. -</para> +remove this file because we don't know which keymap you +need to use.</para> -<para> -<userinput>ln -s <path-to-keymap> defkeymap.map.gz</userinput> +<para><userinput>ln -s <path-to-keymap> defkeymap.map.gz</userinput> With this command you set the default keymap that can be loaded using -the <userinput>loadkeys -d</userinput> command. -</para> +the <userinput>loadkeys -d</userinput> command.</para> </sect2> diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml index b6b8e1aec..1733fb310 100644 --- a/chapter06/kbd-inst.xml +++ b/chapter06/kbd-inst.xml @@ -1,38 +1,24 @@ <sect2> <title>Installation of Kbd</title> -<para> -Install Kbd by running the following commands: -</para> +<para>Install Kbd by running the following commands:</para> -<para> -<screen> -<userinput>./configure --datadir=/usr/share/kbd &&</userinput> +<para><screen><userinput>./configure --datadir=/usr/share/kbd &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz</userinput> -</screen> -</para> +<userinput>rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz</userinput></screen></para> -<para> -Now we have to choose a default keymap. Explore the +<para>Now we have to choose a default keymap. Explore the /usr/share/kbd/keymaps directory, and find the keymap that you would like to use -as a default. Then execute this command: -</para> +as a default. Then execute this command:</para> -<para> -<screen> -<userinput>cd /usr/share/kbd/keymaps &&</userinput> -<userinput>ln -s <path-to-keymap> defkeymap.map.gz</userinput> -</screen> -</para> +<para><screen><userinput>cd /usr/share/kbd/keymaps &&</userinput> +<userinput>ln -s <path-to-keymap> defkeymap.map.gz</userinput></screen></para> -<para> -Replace <userinput><path-to-keymap></userinput> with the path to the +<para>Replace <userinput><path-to-keymap></userinput> with the path to the keymap you have selected, relative to the /usr/share/kbd/keymaps/ directory. For example, if you have chosen the US keymap, you would replace it with -i386/qwerty/us.map.gz. -</para> +i386/qwerty/us.map.gz.</para> </sect2> diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml index 5857bd2c2..d4e109959 100644 --- a/chapter06/kbd.xml +++ b/chapter06/kbd.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-kbd"> <title>Installing Kbd</title> -<screen> -Estimated build time: &kbd-time; -Estimated disk space required: &kbd-compsize; -</screen> +<screen>Estimated build time: &kbd-time; +Estimated disk space required: &kbd-compsize;</screen> &c6-kbd-inst; &c6-kbd-exp; diff --git a/chapter06/less-inst.xml b/chapter06/less-inst.xml index 1750d22ec..0a1edeaa0 100644 --- a/chapter06/less-inst.xml +++ b/chapter06/less-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Less</title> -<para> -Install Less by running the following commands: -</para> +<para>Install Less by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/less.xml b/chapter06/less.xml index b723f9122..40d126121 100644 --- a/chapter06/less.xml +++ b/chapter06/less.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-less"> <title>Installing Less</title> -<screen> -Estimated build time: &less-time; -Estimated disk space required: &less-compsize; -</screen> +<screen>Estimated build time: &less-time; +Estimated disk space required: &less-compsize;</screen> &c6-less-inst; &aa-less-desc; diff --git a/chapter06/libtool-inst.xml b/chapter06/libtool-inst.xml index 8e5333702..c0c861846 100644 --- a/chapter06/libtool-inst.xml +++ b/chapter06/libtool-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Libtool</title> -<para> -Install Libtool by running the following commands: -</para> +<para>Install Libtool by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml index 94135e34d..fc4536b47 100644 --- a/chapter06/libtool.xml +++ b/chapter06/libtool.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-libtool"> <title>Installing Libtool</title> -<screen> -Estimated build time: &libtool-time; -Estimated disk space required: &libtool-compsize; -</screen> +<screen>Estimated build time: &libtool-time; +Estimated disk space required: &libtool-compsize;</screen> &c6-libtool-inst; &aa-libtool-desc; diff --git a/chapter06/lilo-inst.xml b/chapter06/lilo-inst.xml index e4c8a2b13..03c1eb6c1 100644 --- a/chapter06/lilo-inst.xml +++ b/chapter06/lilo-inst.xml @@ -1,45 +1,32 @@ <sect2> <title>Installation of Lilo</title> -<para> -We have chosen Lilo because we feel confortable with it, but you may wish to -take a look elsewhere. Someone has written a hint on GRUB at<ulink -url="http://archive.linuxfromscratch.org/lfs-hints/grub-howto.txt"> -http://archive.linuxfromscratch.org/lfs-hints/grub-howto.txt</ulink>, - an alternative boot loader. -</para> - -<para> -Install Lilo by running the following commands: -</para> - -<para> -<screen> -<userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> - -<para> -It appears that compilation of this package fails on certain machines +<para>We have chosen Lilo because we feel confortable with it, but you +may wish to take a look elsewhere. Someone has written a hint on +GRUB at<ulink +url="http://archive.linuxfromscratch.org/lfs-hints/grub-howto.txt">http://archive.linuxfromscratch.org/lfs-hints/grub-howto.txt</ulink>, + an alternative boot loader.</para> + +<para>Install Lilo by running the following commands:</para> + +<para><screen><userinput>make &&</userinput> +<userinput>make install</userinput></screen></para> + +<para>It appears that compilation of this package fails on certain machines when the -g compiler flag is being used. If you can't compile Lilo at all, you should try to remove the -g value from the CFLAGS variable in the -<filename>Makefile</filename> file. -</para> +<filename>Makefile</filename> file.</para> -<para> -At the end of the installation the make install process will print a +<para>At the end of the installation the make install process will print a message stating that /sbin/lilo has to be executed to complete the update. Don't do this as it has no use. The /etc/lilo.conf isn't present -yet. We will complete the installation of lilo in chapter 8. -</para> - -<para> -Maybe you'll be interested to know that someone wrote a hint on how to get a -logo instead the the standard LILO prompt or menu. Take a look at it at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/bootlogo.txt"> -http://archive.linuxfromscratch.org/lfs-hints/bootlogo.txt</ulink>. -</para> +yet. We will complete the installation of lilo in chapter 8.</para> + +<para>Maybe you'll be interested to know that someone wrote a hint on +how to get a logo instead the the standard LILO prompt or menu. Take +a look at it at <ulink +url="http://archive.linuxfromscratch.org/lfs-hints/bootlogo.txt">http://archive.linuxfromscratch.org/lfs-hints/bootlogo.txt</ulink> +.</para> </sect2> diff --git a/chapter06/lilo.xml b/chapter06/lilo.xml index 33325f63d..be10b0b86 100644 --- a/chapter06/lilo.xml +++ b/chapter06/lilo.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-lilo"> <title>Installing Lilo</title> -<screen> -Estimated build time: &lilo-time; -Estimated disk space required: &lilo-compsize; -</screen> +<screen>Estimated build time: &lilo-time; +Estimated disk space required: &lilo-compsize;</screen> &c6-lilo-inst; &aa-lilo-desc; diff --git a/chapter06/m4-inst.xml b/chapter06/m4-inst.xml index 3c20e2a6e..86371eaa5 100644 --- a/chapter06/m4-inst.xml +++ b/chapter06/m4-inst.xml @@ -1,20 +1,13 @@ <sect2> <title>Installation of M4</title> -<para> -Install M4 by running the following commands: -</para> +<para>Install M4 by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> -<para> -If the base system is running a 2.0 kernel and the Glibc version is +<para>If the base system is running a 2.0 kernel and the Glibc version is 2.1 then you will most likely get problems executing M4 in the chroot'ed environment due to incompatibilities between the M4 program, Glibc-2.1 and the running 2.0 kernel. If you have problems executing the @@ -23,36 +16,23 @@ the autoconf and automake packages) you'll have to exit the chroot'ed environment and compile M4 statically. This way the binary is linked against Glibc 2.0 (if he runs kernel 2.0, Glibc version is 2.0 as well on a decent system. Kernel 2.0 and Glibc-2.1 don't mix very well) -and won't give any problems. -</para> +and won't give any problems.</para> -<para> -To create a statically linked version of M4, execute the following -commands: -</para> +<para>To create a statically linked version of M4, execute the following +commands:</para> -<para> -<screen> -<userinput>logout</userinput> +<para><screen><userinput>logout</userinput> <userinput>cd $LFS/usr/src/m4-1.4</userinput> <userinput>./configure --prefix=/usr</userinput> <userinput>make LDFLAGS=-static</userinput> -<userinput>make prefix=$LFS/usr install</userinput> -</screen> -</para> +<userinput>make prefix=$LFS/usr install</userinput></screen></para> -<para> -Now the chroot'ed environment can be re-entered and the +<para>Now the chroot'ed environment can be re-entered and the next package an be installed. If M4 should be re-compiled dynamically, -this can be done -after having rebooted into the LFS system rather than chrooting into it. -</para> - -<para> -<screen> -&c6-chrootcmd; -</screen> -</para> +this can be done after having rebooted into the LFS system +rather than chrooting into it.</para> + +<para><screen>&c6-chrootcmd;</screen></para> </sect2> diff --git a/chapter06/m4.xml b/chapter06/m4.xml index ab1b8ce8e..ff03d2e44 100644 --- a/chapter06/m4.xml +++ b/chapter06/m4.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-m4"> <title>Installing M4</title> -<screen> -Estimated build time: &m4-time; -Estimated disk space required: &m4-compsize; -</screen> +<screen>Estimated build time: &m4-time; +Estimated disk space required: &m4-compsize;</screen> &c6-m4-inst; &aa-m4-desc; diff --git a/chapter06/make-inst.xml b/chapter06/make-inst.xml index ebf668ae6..bf818f27c 100644 --- a/chapter06/make-inst.xml +++ b/chapter06/make-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Make</title> -<para> -Install Make by running the following commands: -</para> +<para>Install Make by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/make.xml b/chapter06/make.xml index 4d90cf0ea..202fe7dd9 100644 --- a/chapter06/make.xml +++ b/chapter06/make.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-make"> <title>Installing Make</title> -<screen> -Estimated build time: &make-time; -Estimated disk space required: &make-compsize; -</screen> +<screen>Estimated build time: &make-time; +Estimated disk space required: &make-compsize;</screen> &c6-make-inst; &aa-make-desc; diff --git a/chapter06/makedev-exp.xml b/chapter06/makedev-exp.xml index 7fd515b6c..12c9287b1 100644 --- a/chapter06/makedev-exp.xml +++ b/chapter06/makedev-exp.xml @@ -1,12 +1,10 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>./MAKEDEV -v generic:</userinput> This creates generic +<para><userinput>./MAKEDEV -v generic:</userinput> This creates generic devices. Normally, these devices are all devices you need. It's possible that you are missing some special devices that are needed for your hardware -configuration. Create them with ./MAKEDEV -v <device>. -</para> +configuration. Create them with ./MAKEDEV -v <device>.</para> </sect2> diff --git a/chapter06/makedev-inst.xml b/chapter06/makedev-inst.xml index f59a1a23b..3ea236280 100644 --- a/chapter06/makedev-inst.xml +++ b/chapter06/makedev-inst.xml @@ -1,29 +1,19 @@ <sect2> <title>Creating devices</title> -<para> -Note: the MAKEDEV.bz2 file you have unpacked is not an archive, so it -won't create a directory for you to cd into. -</para> +<para>Note: the MAKEDEV.bz2 file you have unpacked is not an archive, so it +won't create a directory for you to cd into.</para> -<para> -Create the device files by running the following commands: -</para> +<para>Create the device files by running the following commands:</para> -<para> -<screen> -<userinput>cp MAKEDEV-1.1 /dev/MAKEDEV &&</userinput> +<para><screen><userinput>cp MAKEDEV-1.1 /dev/MAKEDEV &&</userinput> <userinput>cd /dev &&</userinput> <userinput>chmod 755 MAKEDEV &&</userinput> -<userinput>./MAKEDEV -v generic</userinput> -</screen> -</para> +<userinput>./MAKEDEV -v generic</userinput></screen></para> -<para> -MAKEDEV will create hda[1-20] and hdb[1-20] and such but keep in mind +<para>MAKEDEV will create hda[1-20] and hdb[1-20] and such but keep in mind that you may not be able to use all of those devices due to kernel -limitations regarding the max. number of partitions. -</para> +limitations regarding the max. number of partitions.</para> </sect2> diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml index cfb821ccc..02f3f092a 100644 --- a/chapter06/man-exp.xml +++ b/chapter06/man-exp.xml @@ -1,11 +1,9 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>patch -Np1 -i ../man-1.5i2.patch:</userinput> This patch +<para><userinput>patch -Np1 -i ../man-1.5i2.patch:</userinput> This patch changes man so that it uses awk instead of gawk which is the default. -We use this as LFS uses awk instead of gawk. -</para> +We use this as LFS uses awk instead of gawk.</para> </sect2> diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index 6126fbea0..a92c776c4 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -1,24 +1,15 @@ <sect2> <title>Installation of Man</title> -<para> -Before Man is installed, the man patch file needs to be unpacked. -</para> +<para>Before Man is installed, the man patch file needs to be unpacked.</para> -<para> -<screen> -<userinput>patch -Np1 -i ../man-&man-version;.patch &&</userinput> +<para><screen><userinput>patch -Np1 -i ../man-&man-version;.patch &&</userinput> <userinput>./configure -default &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> -<para> -You may want to take a look at the man hint at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/man.txt"> -http://archive.linuxfromscratch.org/lfs-hints/man.txt</ulink> -which deals with formatting and compression issues for man pages. -</para> +<para>You may want to take a look at the man hint at <ulink +url="http://archive.linuxfromscratch.org/lfs-hints/man.txt">http://archive.linuxfromscratch.org/lfs-hints/man.txt</ulink> +which deals with formatting and compression issues for man pages.</para> </sect2> diff --git a/chapter06/man.xml b/chapter06/man.xml index fa0449b4c..009855e0a 100644 --- a/chapter06/man.xml +++ b/chapter06/man.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-man"> <title>Installing Man</title> -<screen> -Estimated build time: &man-time; -Estimated disk space required: &man-compsize; -</screen> +<screen>Estimated build time: &man-time; +Estimated disk space required: &man-compsize;</screen> &c6-man-inst; &c6-man-exp; diff --git a/chapter06/manpages-exp.xml b/chapter06/manpages-exp.xml index be1fa6ea8..af5ff0c75 100644 --- a/chapter06/manpages-exp.xml +++ b/chapter06/manpages-exp.xml @@ -1,11 +1,9 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch</userinput>: +<para><userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch</userinput>: We patch the man-pages package to include two important missing pages: -<filename>ldd</filename>'s, and <filename>ld.so</filename>'s. -</para> +<filename>ldd</filename>'s, and <filename>ld.so</filename>'s.</para> </sect2> diff --git a/chapter06/manpages-inst.xml b/chapter06/manpages-inst.xml index 67ce29201..13781a047 100644 --- a/chapter06/manpages-inst.xml +++ b/chapter06/manpages-inst.xml @@ -1,16 +1,10 @@ <sect2> <title>Installation of Man-pages</title> -<para> -Install Man-pages by running the following command: -</para> +<para>Install Man-pages by running the following command:</para> -<para> -<screen> -<userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<para><screen><userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch &&</userinput> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/manpages.xml b/chapter06/manpages.xml index 4a77284f4..634902bae 100644 --- a/chapter06/manpages.xml +++ b/chapter06/manpages.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-manpages"> <title>Installing Man-pages</title> -<screen> -Estimated build time: &man-pages-time; -Estimated disk space required: &man-pages-compsize; -</screen> +<screen>Estimated build time: &man-pages-time; +Estimated disk space required: &man-pages-compsize;</screen> &c6-manpages-inst; &c6-manpages-exp; diff --git a/chapter06/mawk-inst.xml b/chapter06/mawk-inst.xml index 631ea0511..87380832b 100644 --- a/chapter06/mawk-inst.xml +++ b/chapter06/mawk-inst.xml @@ -1,20 +1,14 @@ <sect2> <title>Installation of Mawk</title> -<para> -Install Mawk by running the following commands: -</para> +<para>Install Mawk by running the following commands:</para> -<para> -<screen> -<userinput>./configure &&</userinput> +<para><screen><userinput>./configure &&</userinput> <userinput>make &&</userinput> <userinput>make BINDIR=/usr/bin \</userinput> <userinput> MANDIR=/usr/share/man/man1 install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>ln -s mawk awk</userinput> -</screen> -</para> +<userinput>ln -s mawk awk</userinput></screen></para> </sect2> diff --git a/chapter06/mawk.xml b/chapter06/mawk.xml index 1e1334ba0..a43eddea6 100644 --- a/chapter06/mawk.xml +++ b/chapter06/mawk.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-mawk"> <title>Installing Mawk</title> -<screen> -Estimated build time: &mawk-time; -Estimated disk space required: &mawk-compsize; -</screen> +<screen>Estimated build time: &mawk-time; +Estimated disk space required: &mawk-compsize;</screen> &c6-mawk-inst; &aa-mawk-desc; diff --git a/chapter06/modutils-inst.xml b/chapter06/modutils-inst.xml index dbe9e8480..1002e2892 100644 --- a/chapter06/modutils-inst.xml +++ b/chapter06/modutils-inst.xml @@ -1,23 +1,15 @@ <sect2> <title>Installation of Modutils</title> -<para> -The 2.4.6 version of modutils does not seem to work properly with the +<para>The 2.4.6 version of modutils does not seem to work properly with the 2.2.x kernels. If you are running a 2.2.x kernel we suggest you -downgrade to modutils 2.4.5 which seems to be working better. -</para> +downgrade to modutils 2.4.5 which seems to be working better.</para> -<para> -Install Modutils by running the following commands: -</para> +<para>Install Modutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure &&</userinput> +<para><screen><userinput>./configure &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/modutils.xml b/chapter06/modutils.xml index b4d25eccd..869d8dd53 100644 --- a/chapter06/modutils.xml +++ b/chapter06/modutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-modutils"> <title>Installing Modutils</title> -<screen> -Estimated build time: &modutils-time; -Estimated disk space required: &modutils-compsize; -</screen> +<screen>Estimated build time: &modutils-time; +Estimated disk space required: &modutils-compsize;</screen> &c6-modutils-inst; &aa-modutils-desc; diff --git a/chapter06/ncurses-exp.xml b/chapter06/ncurses-exp.xml index 78b7a3cde..93eb4ab1b 100644 --- a/chapter06/ncurses-exp.xml +++ b/chapter06/ncurses-exp.xml @@ -1,21 +1,15 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>patch -Np1 -F10 -i ../ncurses-5.2.patch:</userinput> Regular +<para><userinput>patch -Np1 -F10 -i ../ncurses-5.2.patch:</userinput> Regular updates to the ncurses package are provided as patch files so this is -to make the source tree up to date. -</para> +to make the source tree up to date.</para> -<para> -<userinput>--with-shared:</userinput> This enables the build of the -shared ncurses library files. -</para> +<para><userinput>--with-shared:</userinput> This enables the build of the +shared ncurses library files.</para> -<para> -<userinput>--disable-termcap:</userinput> Disabled the compilation of -termcap fall back support. -</para> +<para><userinput>--disable-termcap:</userinput> Disabled the compilation of +termcap fall back support.</para> </sect2> diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml index b5433a0fe..865d90d66 100644 --- a/chapter06/ncurses-inst.xml +++ b/chapter06/ncurses-inst.xml @@ -1,19 +1,13 @@ <sect2> <title>Installation of Ncurses</title> -<para> -Install Ncurses by running the following commands: -</para> +<para>Install Ncurses by running the following commands:</para> -<para> -<screen> -<userinput>patch -Np1 -F10 -i ../ncurses-&ncurses-version;.patch &&</userinput> +<para><screen><userinput>patch -Np1 -F10 -i ../ncurses-&ncurses-version;.patch &&</userinput> <userinput>./configure --prefix=/usr --libdir=/lib \</userinput> <userinput> --with-shared --disable-termcap &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index e9f17988e..0e8ddb060 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-ncurses"> <title>Installing Ncurses</title> -<screen> -Estimated build time: &ncurses-time; -Estimated disk space required: &ncurses-compsize; -</screen> +<screen>Estimated build time: &ncurses-time; +Estimated disk space required: &ncurses-compsize;</screen> &c6-ncurses-inst; &c6-ncurses-exp; diff --git a/chapter06/netkitbase-inst.xml b/chapter06/netkitbase-inst.xml index 9860311d1..c4cc5d3ce 100644 --- a/chapter06/netkitbase-inst.xml +++ b/chapter06/netkitbase-inst.xml @@ -1,25 +1,17 @@ <sect2> <title>Installation of Netkit-base</title> -<para> -Install Netkit-base by running the following commands: -</para> +<para>Install Netkit-base by running the following commands:</para> -<para> -<screen> -<userinput>./configure &&</userinput> +<para><screen><userinput>./configure &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd etc.sample &&</userinput> -<userinput>cp services protocols /etc</userinput> -</screen> -</para> +<userinput>cp services protocols /etc</userinput></screen></para> -<para> -There are other files in the <filename +<para>There are other files in the <filename class="directory">etc.sample</filename> directory which might be of -interest to the user. -</para> +interest to the user.</para> </sect2> diff --git a/chapter06/netkitbase.xml b/chapter06/netkitbase.xml index 3d6ef1a81..9980f2548 100644 --- a/chapter06/netkitbase.xml +++ b/chapter06/netkitbase.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-netkitbase"> <title>Installing Netkit-base</title> -<screen> -Estimated build time: &netkit-base-time; -Estimated disk space required: &netkit-base-compsize; -</screen> +<screen>Estimated build time: &netkit-base-time; +Estimated disk space required: &netkit-base-compsize;</screen> &c6-netkitbase-inst; &aa-netkitbase-desc; diff --git a/chapter06/nettools-inst.xml b/chapter06/nettools-inst.xml index 37fd86d0d..efdc164ff 100644 --- a/chapter06/nettools-inst.xml +++ b/chapter06/nettools-inst.xml @@ -1,16 +1,10 @@ <sect2> <title>Installation of Net-tools</title> -<para> -Install Net-tools by running the following commands: -</para> +<para>Install Net-tools by running the following commands:</para> -<para> -<screen> -<userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<para><screen><userinput>make &&</userinput> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml index 6c74449af..ed218c6c2 100644 --- a/chapter06/nettools.xml +++ b/chapter06/nettools.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-nettools"> <title>Installing Net-tools</title> -<screen> -Estimated build time: &net-tools-time; -Estimated disk space required: &net-tools-compsize; -</screen> +<screen>Estimated build time: &net-tools-time; +Estimated disk space required: &net-tools-compsize;</screen> &c6-nettools-inst; &aa-nettools-desc; diff --git a/chapter06/patch-inst.xml b/chapter06/patch-inst.xml index ff9c2a365..bf921f26f 100644 --- a/chapter06/patch-inst.xml +++ b/chapter06/patch-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Patch</title> -<para> -Install Patch by running the following commands: -</para> +<para>Install Patch by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/patch.xml b/chapter06/patch.xml index 537be5943..e8eb1fc54 100644 --- a/chapter06/patch.xml +++ b/chapter06/patch.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-patch"> <title>Installing Patch</title> -<screen> -Estimated build time: &patch-time; -Estimated disk space required: &patch-compsize; -</screen> +<screen>Estimated build time: &patch-time; +Estimated disk space required: &patch-compsize;</screen> &c6-patch-inst; &aa-patch-desc; diff --git a/chapter06/perl-inst.xml b/chapter06/perl-inst.xml index 1e7e28015..3c0133859 100644 --- a/chapter06/perl-inst.xml +++ b/chapter06/perl-inst.xml @@ -1,33 +1,21 @@ <sect2> <title>Installation of Perl</title> -<para> -Install Perl by running the following commands: -</para> +<para>Install Perl by running the following commands:</para> -<para> -<screen> -<userinput>./Configure -Dprefix=/usr &&</userinput> +<para><screen><userinput>./Configure -Dprefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> -<para> -If you don't want to answer all those questions Perl asks, you can +<para>If you don't want to answer all those questions Perl asks, you can add the -d option to the configure script and Perl will use all the default settings. To avoid the Configure script asking questions after the config.sh file has been created you can pass the -e parameter -to perl as well. The commands with these parameters included will be: -</para> +to perl as well. The commands with these parameters included will be:</para> -<para> -<screen> -<userinput>./Configure -Dprefix=/usr -d -e &&</userinput> +<para><screen><userinput>./Configure -Dprefix=/usr -d -e &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/perl.xml b/chapter06/perl.xml index e6862f2ef..0856b4c99 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-perl"> <title>Installing Perl</title> -<screen> -Estimated build time: &perl-time; -Estimated disk space required: &perl-compsize; -</screen> +<screen>Estimated build time: &perl-time; +Estimated disk space required: &perl-compsize;</screen> &c6-perl-inst; &aa-perl-desc; diff --git a/chapter06/procinfo-exp.xml b/chapter06/procinfo-exp.xml index f9adca8a6..18a53165a 100644 --- a/chapter06/procinfo-exp.xml +++ b/chapter06/procinfo-exp.xml @@ -1,14 +1,12 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>sed "s/-ltermcap/-lncurses/" Makefile | make -f -:</userinput> +<para><userinput>sed "s/-ltermcap/-lncurses/" Makefile | make -f -:</userinput> This will replace -ltermcap with -lncurses in the Makefile and pipe the output of sed (the modified Makefile) directly to the make program. This is an alternate and more efficient way to direct the output to a file and tell make to use that alternate file. We do this because libtermcap -is declared obsolete in favor of libncurses. -</para> +is declared obsolete in favor of libncurses.</para> </sect2> diff --git a/chapter06/procinfo-inst.xml b/chapter06/procinfo-inst.xml index dde3916cb..9aa8ba480 100644 --- a/chapter06/procinfo-inst.xml +++ b/chapter06/procinfo-inst.xml @@ -1,16 +1,10 @@ <sect2> <title>Installation of Procinfo</title> -<para> -Install Procinfo by running the following commands: -</para> +<para>Install Procinfo by running the following commands:</para> -<para> -<screen> -<userinput>sed "s/-ltermcap/-lncurses/" Makefile | make -f - &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<para><screen><userinput>sed "s/-ltermcap/-lncurses/" Makefile | make -f - &&</userinput> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/procinfo.xml b/chapter06/procinfo.xml index a65af393d..166e3c064 100644 --- a/chapter06/procinfo.xml +++ b/chapter06/procinfo.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-procinfo"> <title>Installing Procinfo</title> -<screen> -Estimated build time: &procinfo-time; -Estimated disk space required: &procinfo-compsize; -</screen> +<screen>Estimated build time: &procinfo-time; +Estimated disk space required: &procinfo-compsize;</screen> &c6-procinfo-inst; &c6-procinfo-exp; diff --git a/chapter06/procps-exp.xml b/chapter06/procps-exp.xml index 0b5a00c2c..87e7c9a13 100644 --- a/chapter06/procps-exp.xml +++ b/chapter06/procps-exp.xml @@ -1,13 +1,11 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>make XSCPT='' install:</userinput> +<para><userinput>make XSCPT='' install:</userinput> This will set the Makefile variable XSCPT to an empty value so that the XConsole installation is disabled. Otherwise "Make install" tries to copy the file XConsole to /usr/X11R6/bin. -And that directory does not exist, because X is not installed yet. -</para> +And that directory does not exist, because X is not installed yet.</para> </sect2> diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml index 65b1fd107..f76bafd5a 100644 --- a/chapter06/procps-inst.xml +++ b/chapter06/procps-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Procps</title> -<para> -Install Procps by running the following commands: -</para> +<para>Install Procps by running the following commands:</para> -<para> -<screen> -<userinput>make &&</userinput> +<para><screen><userinput>make &&</userinput> <userinput>make XSCPT='' install &&</userinput> -<userinput>mv /usr/bin/kill /bin</userinput> -</screen> -</para> +<userinput>mv /usr/bin/kill /bin</userinput></screen></para> </sect2> diff --git a/chapter06/procps.xml b/chapter06/procps.xml index 568cb4088..b9466d6c3 100644 --- a/chapter06/procps.xml +++ b/chapter06/procps.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-procps"> <title>Installing Procps</title> -<screen> -Estimated build time: &procps-time; -Estimated disk space required: &procps-compsize; -</screen> +<screen>Estimated build time: &procps-time; +Estimated disk space required: &procps-compsize;</screen> &c6-procps-inst; &c6-procps-exp; diff --git a/chapter06/psmisc-inst.xml b/chapter06/psmisc-inst.xml index b8194286a..100817235 100644 --- a/chapter06/psmisc-inst.xml +++ b/chapter06/psmisc-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Psmisc</title> -<para> -Install Psmisc by running the following commands: -</para> +<para>Install Psmisc by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml index f7e7d4b1b..54d122761 100644 --- a/chapter06/psmisc.xml +++ b/chapter06/psmisc.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-psmisc"> <title>Installing Psmisc</title> -<screen> -Estimated build time: &psmisc-time; -Estimated disk space required: &psmisc-compsize; -</screen> +<screen>Estimated build time: &psmisc-time; +Estimated disk space required: &psmisc-compsize;</screen> &c6-psmisc-inst; &aa-psmisc-desc; diff --git a/chapter06/removeoldnss.xml b/chapter06/removeoldnss.xml index dfba1e670..3d2214870 100644 --- a/chapter06/removeoldnss.xml +++ b/chapter06/removeoldnss.xml @@ -1,17 +1,11 @@ <sect1 id="ch06-removeoldnss"> <title>Removing old NSS library files</title> -<para> -If you have copied the NSS Library files from the normal Linux system to the -LFS system (because the normal system runs glibc-2.0) it's time to remove -them now by running: -</para> +<para>If you have copied the NSS Library files from the normal Linux system +to the LFS system (because the normal system runs glibc-2.0) it's time to remove +them now by running:</para> -<para> -<screen> -<userinput>rm /lib/libnss*.so.1 /lib/libnss*2.0*</userinput> -</screen> -</para> +<para><screen><userinput>rm /lib/libnss*.so.1 /lib/libnss*2.0*</userinput></screen></para> </sect1> diff --git a/chapter06/sed-inst.xml b/chapter06/sed-inst.xml index 795d72926..bded36b7b 100644 --- a/chapter06/sed-inst.xml +++ b/chapter06/sed-inst.xml @@ -1,17 +1,11 @@ <sect2> <title>Installation of Sed</title> -<para> -Install Sed by running the following commands: -</para> +<para>Install Sed by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/sed.xml b/chapter06/sed.xml index 54fa042bc..b7cc52ec6 100644 --- a/chapter06/sed.xml +++ b/chapter06/sed.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-sed"> <title>Installing Sed</title> -<screen> -Estimated build time: &sed-time; -Estimated disk space required: &sed-compsize; -</screen> +<screen>Estimated build time: &sed-time; +Estimated disk space required: &sed-compsize;</screen> &c6-sed-inst; &aa-sed-desc; diff --git a/chapter06/shadowpwd-exp.xml b/chapter06/shadowpwd-exp.xml index 7343088a1..fc162e326 100644 --- a/chapter06/shadowpwd-exp.xml +++ b/chapter06/shadowpwd-exp.xml @@ -1,18 +1,14 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>cp limits login.access and others:</userinput> These files +<para><userinput>cp limits login.access and others:</userinput> These files were not installed during the installation of the package so we copy them manually as those files are used to configure authentication -details on the system. -</para> +details on the system.</para> -<para> -<userinput>sed "s|/var/spool/mail|/var/mail|" login.defs.linux > +<para><userinput>sed "s|/var/spool/mail|/var/mail|" login.defs.linux > /etc/login.defs</userinput>: /var/spool/mail is the old location of the -user mailboxes. The location that is used nowadays is /var/mail. -</para> +user mailboxes. The location that is used nowadays is /var/mail.</para> </sect2> diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index 668d6dca4..517d1adb2 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/chapter06/shadowpwd-inst.xml @@ -1,21 +1,15 @@ <sect2> <title>Installation of Shadow Password Suite</title> -<para> -Install the Shadow Password Suite by running the following commands: -</para> +<para>Install the Shadow Password Suite by running the following commands:</para> -<para> -<screen> -<userinput>patch -Np1 -i ../shadow-20001016.patch &&</userinput> +<para><screen><userinput>patch -Np1 -i ../shadow-20001016.patch &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd etc &&</userinput> <userinput>cp limits login.access /etc &&</userinput> -<userinput>sed "s|/var/spool/mail|/var/mail|" login.defs.linux > /etc/login.defs</userinput> -</screen> -</para> +<userinput>sed "s|/var/spool/mail|/var/mail|" login.defs.linux > /etc/login.defs</userinput></screen></para> </sect2> diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml index 5eebb9f10..7a2c56c53 100644 --- a/chapter06/shadowpwd.xml +++ b/chapter06/shadowpwd.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-shadow"> <title>Installing Shadowpwd</title> -<screen> -Estimated build time: &shadow-time; -Estimated disk space required: &shadow-compsize; -</screen> +<screen>Estimated build time: &shadow-time; +Estimated disk space required: &shadow-compsize;</screen> &c6-shadowpwd-inst; &c6-shadowpwd-exp; diff --git a/chapter06/shellutils-inst.xml b/chapter06/shellutils-inst.xml index 4e24c3af6..7b0ac4122 100644 --- a/chapter06/shellutils-inst.xml +++ b/chapter06/shellutils-inst.xml @@ -1,40 +1,28 @@ <sect2> <title>Installation of Sh-utils</title> -<para> -Install Shellutils by running the following commands: -</para> +<para>Install Shellutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> <userinput>mv date echo false pwd stty /bin &&</userinput> -<userinput>mv su true uname hostname /bin</userinput> -</screen> -</para> +<userinput>mv su true uname hostname /bin</userinput></screen></para> </sect2> <sect2> <title>FHS compliance notes</title> -<para> -There is a command installed in this package which is named test. It is often -used in shell scripts to evaluate conditions, but is more often encountered -in the form of <command>[ condition ]</command>. These brackets are built into -the bash interpreter, but the FHS dictates that there should be a +<para>There is a command installed in this package which is named test. It is +often used in shell scripts to evaluate conditions, but is more often +encountered in the form of <command>[ condition ]</command>. These brackets +are built into the bash interpreter, but the FHS dictates that there should be a <filename>[</filename> binary. We create that in this way, while still in the -<filename>/usr/bin</filename> directory: -</para> - -<para> -<screen> -<userinput>ln -s test [</userinput> -</screen> -</para> +<filename>/usr/bin</filename> directory:</para> + +<para><screen><userinput>ln -s test [</userinput></screen></para> </sect2> diff --git a/chapter06/shellutils.xml b/chapter06/shellutils.xml index 0d067b4c1..b726f96a9 100644 --- a/chapter06/shellutils.xml +++ b/chapter06/shellutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-shutils"> <title>Installing Sh-utils</title> -<screen> -Estimated build time: &sh-utils-time; -Estimated disk space required: &sh-utils-compsize; -</screen> +<screen>Estimated build time: &sh-utils-time; +Estimated disk space required: &sh-utils-compsize;</screen> &c6-shellutils-inst; &aa-shellutils-desc; diff --git a/chapter06/sysklogd-inst.xml b/chapter06/sysklogd-inst.xml index 42beb3342..6e01e274c 100644 --- a/chapter06/sysklogd-inst.xml +++ b/chapter06/sysklogd-inst.xml @@ -1,16 +1,10 @@ <sect2> <title>Installation of Sysklogd</title> -<para> -Install Sysklogd by running the following commands: -</para> +<para>Install Sysklogd by running the following commands:</para> -<para> -<screen> -<userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<para><screen><userinput>make &&</userinput> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml index f581cccb7..0d9b63819 100644 --- a/chapter06/sysklogd.xml +++ b/chapter06/sysklogd.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-sysklogd"> <title>Installing Sysklogd</title> -<screen> -Estimated build time: &sysklogd-time; -Estimated disk space required: &sysklogd-compsize; -</screen> +<screen>Estimated build time: &sysklogd-time; +Estimated disk space required: &sysklogd-compsize;</screen> &c6-sysklogd-inst; &aa-sysklogd-desc; diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml index 846c28944..d0a58fbb3 100644 --- a/chapter06/sysvinit-inst.xml +++ b/chapter06/sysvinit-inst.xml @@ -1,8 +1,7 @@ <sect2> <title>Installation of Sysvinit</title> -<para> -When run levels are changed (for example when going to shutdown +<para>When run levels are changed (for example when going to shutdown the system) the init program is going to send the TERM and KILL signals to all the processes that init started. But init prints a message to the screen saying "sending all processes the TERM signal" and the same for the @@ -10,29 +9,16 @@ KILL signal. This implies that init sends this signal to all the currently running processes, which isn't the case. To avoid this confusion a user can apply the sysvinit patch found on the LFS FTP site to sysvinit that changes the sentence in the shutdown.c file and have it print "sending all -processes started by init the TERM signal". -</para> +processes started by init the TERM signal".</para> -<para> -Apply the patch by running the following command: -</para> +<para>Apply the patch by running the following command:</para> -<para> -<screen> -<userinput>patch -Np1 -i ../sysvinit-2.78.patch</userinput> -</screen> -</para> +<para><screen><userinput>patch -Np1 -i ../sysvinit-2.79.patch</userinput></screen></para> -<para> -Install Sysvinit by running the following commands: -</para> +<para>Install Sysvinit by running the following commands:</para> -<para> -<screen> -<userinput>make -C src &&</userinput> -<userinput>make -C src install</userinput> -</screen> -</para> +<para><screen><userinput>make -C src &&</userinput> +<userinput>make -C src install</userinput></screen></para> </sect2> diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml index d0a7c53f0..166a15ceb 100644 --- a/chapter06/sysvinit.xml +++ b/chapter06/sysvinit.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-sysvinit"> <title>Installing Sysvinit</title> -<screen> -Estimated build time: &sysvinit-time; -Estimated disk space required: &sysvinit-compsize; -</screen> +<screen>Estimated build time: &sysvinit-time; +Estimated disk space required: &sysvinit-compsize;</screen> &c6-sysvinit-inst; &aa-sysvinit-desc; diff --git a/chapter06/tar-inst.xml b/chapter06/tar-inst.xml index a70a2c553..91cadabd3 100644 --- a/chapter06/tar-inst.xml +++ b/chapter06/tar-inst.xml @@ -1,39 +1,25 @@ <sect2> <title>Installation of Tar</title> -<para> -If you want to be able to directly use bzip2 files with tar, you can +<para>If you want to be able to directly use bzip2 files with tar, you can use the tar patch available from the LFS FTP site. This patch will add the -y option to tar which works the same as the -z option to tar (which can be used -for gzip files). -</para> +for gzip files).</para> -<para> -Apply the patch by running the following command: -</para> +<para>Apply the patch by running the following command:</para> -<para> -<screen> -<userinput>cd src &&</userinput> +<para><screen><userinput>cd src &&</userinput> <userinput>patch -i ../../gnutarpatch.txt &&</userinput> -<userinput>cd ..</userinput> -</screen> -</para> +<userinput>cd ..</userinput></screen></para> -<para> -Install Tar by running the following commands from the toplevel -directory: -</para> +<para>Install Tar by running the following commands from the toplevel +directory:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --libexecdir=/usr/bin \</userinput> +<para><screen><userinput>./configure --prefix=/usr --libexecdir=/usr/bin \</userinput> <userinput> --bindir=/bin &&</userinput> <userinput>make &&</userinput> -<userinput>make install</userinput> -</screen> -</para> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/tar.xml b/chapter06/tar.xml index aeafc69c5..d28b0bf66 100644 --- a/chapter06/tar.xml +++ b/chapter06/tar.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-tar"> <title>Installing Tar</title> -<screen> -Estimated build time: &tar-time; -Estimated disk space required: &tar-compsize; -</screen> +<screen>Estimated build time: &tar-time; +Estimated disk space required: &tar-compsize;</screen> &c6-tar-inst; &aa-tar-desc; diff --git a/chapter06/texinfo-exp.xml b/chapter06/texinfo-exp.xml index 4ab1323f6..7dda4a0d4 100644 --- a/chapter06/texinfo-exp.xml +++ b/chapter06/texinfo-exp.xml @@ -1,11 +1,9 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>patch -Np1 -i ../texinfo-4.0.patch:</userinput> This patch +<para><userinput>patch -Np1 -i ../texinfo-4.0.patch:</userinput> This patch fixes a problem with compiling texinfo on gcc-3.0 systems. More specifically, it moves an #ifdef out of a printf macro in order to be -compatible. -</para> +compatible.</para> </sect2> diff --git a/chapter06/texinfo-inst.xml b/chapter06/texinfo-inst.xml index 9eadf1ea0..e92fc1058 100644 --- a/chapter06/texinfo-inst.xml +++ b/chapter06/texinfo-inst.xml @@ -1,19 +1,13 @@ <sect2> <title>Installation of Texinfo</title> -<para> -Install Texinfo by running the following commands: -</para> +<para>Install Texinfo by running the following commands:</para> -<para> -<screen> -<userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch &&</userinput> +<para><screen><userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>make TEXMF=/usr/share/texmf install-tex</userinput> -</screen> -</para> +<userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen></para> </sect2> diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml index 41791478f..f595ccb5e 100644 --- a/chapter06/texinfo.xml +++ b/chapter06/texinfo.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-texinfo"> <title>Installing Texinfo</title> -<screen> -Estimated build time: &texinfo-time; -Estimated disk space required: &texinfo-compsize; -</screen> +<screen>Estimated build time: &texinfo-time; +Estimated disk space required: &texinfo-compsize;</screen> &c6-texinfo-inst; &c6-texinfo-exp; diff --git a/chapter06/textutils-inst.xml b/chapter06/textutils-inst.xml index 0cba4145f..c22802455 100644 --- a/chapter06/textutils-inst.xml +++ b/chapter06/textutils-inst.xml @@ -1,18 +1,12 @@ <sect2> <title>Installation of Textutils</title> -<para> -Install Textutils by running the following commands: -</para> +<para>Install Textutils by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>mv /usr/bin/cat /bin</userinput> -</screen> -</para> +<userinput>mv /usr/bin/cat /bin</userinput></screen></para> </sect2> diff --git a/chapter06/textutils.xml b/chapter06/textutils.xml index 3d4a83b6f..eef47e50a 100644 --- a/chapter06/textutils.xml +++ b/chapter06/textutils.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-textutils"> <title>Installing Textutils</title> -<screen> -Estimated build time: &textutils-time; -Estimated disk space required: &textutils-compsize; -</screen> +<screen>Estimated build time: &textutils-time; +Estimated disk space required: &textutils-compsize;</screen> &c6-textutils-inst; &aa-textutils-desc; diff --git a/chapter06/utillinux-exp.xml b/chapter06/utillinux-exp.xml index 93986ef89..6d2b62edd 100644 --- a/chapter06/utillinux-exp.xml +++ b/chapter06/utillinux-exp.xml @@ -1,10 +1,8 @@ <sect2> <title>Command explanations</title> -<para> -<userinput>HAVE_SLN=yes</userinput>: We don't build this program because -it already was installed by Glibc. -</para> +<para><userinput>HAVE_SLN=yes</userinput>: We don't build this program because +it already was installed by Glibc.</para> </sect2> diff --git a/chapter06/utillinux-inst.xml b/chapter06/utillinux-inst.xml index eaef886fb..77738f2a5 100644 --- a/chapter06/utillinux-inst.xml +++ b/chapter06/utillinux-inst.xml @@ -1,20 +1,14 @@ <sect2> <title>FHS compliance notes</title> -<para> -The FHS recommends that we use /var/lib/hwclock as the location of the adjtime -file, instead of the usual /etc. To make hwclock, which is part of the -util-linux package, FHS-compliant, run the following. -</para> +<para>The FHS recommends that we use /var/lib/hwclock as the location of the +adjtime file, instead of the usual /etc. To make hwclock, which is part of the +util-linux package, FHS-compliant, run the following.</para> -<para> -<screen> -<userinput>sed "s|etc/adjtime\"\$|var/lib/hwclock/adjtime\"|" \</userinput> +<para><screen><userinput>sed "s|etc/adjtime\"\$|var/lib/hwclock/adjtime\"|" \</userinput> <userinput> hwclock/hwclock.c > hwclock~ &&</userinput> <userinput>mv hwclock~ hwclock/hwclock.c &&</userinput> -<userinput>mkdir /var/lib/hwclock</userinput> -</screen> -</para> +<userinput>mkdir /var/lib/hwclock</userinput></screen></para> </sect2> @@ -25,16 +19,12 @@ util-linux package, FHS-compliant, run the following. Install Util-Linux by running the following commands: </para> -<para> -<screen> -<userinput>sed s/HAVE_SLN=no/HAVE_SLN=yes/ \</userinput> +<para><screen><userinput>sed s/HAVE_SLN=no/HAVE_SLN=yes/ \</userinput> <userinput> MCONFIG > MCONFIG~ &&</userinput> <userinput>mv MCONFIG~ MCONFIG &&</userinput> <userinput>./configure &&</userinput> <userinput>make ADD_RAW=yes &&</userinput> -<userinput>make ADD_RAW=yes install</userinput> -</screen> -</para> +<userinput>make ADD_RAW=yes install</userinput></screen></para> </sect2> diff --git a/chapter06/utillinux.xml b/chapter06/utillinux.xml index a9669dee9..5686d393d 100644 --- a/chapter06/utillinux.xml +++ b/chapter06/utillinux.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-utillinux"> <title>Installing Util-linux</title> -<screen> -Estimated build time: &util-linux-time; -Estimated disk space required: &util-linux-compsize; -</screen> +<screen>Estimated build time: &util-linux-time; +Estimated disk space required: &util-linux-compsize;</screen> &c6-utillinux-inst; &c6-utillinux-exp; diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml index 49424450d..fdc15c7be 100644 --- a/chapter06/vim-inst.xml +++ b/chapter06/vim-inst.xml @@ -1,63 +1,46 @@ <sect2> <title>Installation of Vim</title> -<para> -If you don't like vim to be installed as an editor on the LFS system, +<para>If you don't like vim to be installed as an editor on the LFS system, you may want to download an alternative and install an editor you prefer. There are a few hints how to install different editors available at <ulink -url="http://archive.linuxfromscratch.org/lfs-hints/"> -http://www.archive.linuxfromscratch.org/lfs-hints/</ulink>. The -hints which are currently available are for Emacs, Joe and nano. -</para> +url="http://archive.linuxfromscratch.org/lfs-hints/">http://www.archive.linuxfromscratch.org/lfs-hints/</ulink> +. The hints which are currently available are for Emacs, Joe and nano.</para> -<para> -Both the vim-rt and vim-src packages need to be unpacked to install Vim. +<para>Both the vim-rt and vim-src packages need to be unpacked to install Vim. Both packages will unpack their files into the vim-&vim-version; directory. This won't overwrite any files from the other package. So it doesn't matter -in which order it is done. Install Vim by running the following commands: -</para> +in which order it is done. Install Vim by running the following commands:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr &&</userinput> +<para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>ln -s vim vi</userinput> -</screen> -</para> +<userinput>ln -s vim vi</userinput></screen></para> -<para> -If you plan on installing the X Window system on your LFS +<para>If you plan on installing the X Window system on your LFS system, you might want to re-compile Vim after you have installed X. Vim comes with a nice GUI version of the editor which requires X and a few other libraries to be installed. For more information read the Vim -documentation. -</para> +documentation.</para> </sect2> <sect2> <title>FHS compliance notes</title> -<para> -The FHS says that editors like vim should use /var/lib/<editor> for their -temporary state files, like temporary save files for example. If you wish vim to -conform to the FHS, you should use this command set instead of the one presented -above: -</para> +<para>The FHS says that editors like vim should use /var/lib/<editor> +for their temporary state files, like temporary save files for example. +If you wish vim to conform to the FHS, you should use this command set +instead of the one presented above:</para> -<para> -<screen> -<userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &&</userinput> +<para><screen><userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> <userinput>ln -s vim vi &&</userinput> -<userinput>mkdir /var/lib/vim</userinput> -</screen> -</para> +<userinput>mkdir /var/lib/vim</userinput></screen></para> </sect2> diff --git a/chapter06/vim.xml b/chapter06/vim.xml index e96d078fb..37cc4c495 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -1,10 +1,8 @@ <sect1 id="ch06-vim"> <title>Installing Vim</title> -<screen> -Estimated build time: &vim-time; -Estimated disk space required: &vim-compsize; -</screen> +<screen>Estimated build time: &vim-time; +Estimated disk space required: &vim-compsize;</screen> &c6-vim-inst; &aa-vim-desc; |