diff options
| author | Gerard Beekmans <gerard@linuxfromscratch.org> | 2001-07-06 15:25:48 +0000 |
|---|---|---|
| committer | Gerard Beekmans <gerard@linuxfromscratch.org> | 2001-07-06 15:25:48 +0000 |
| commit | 11ce06ae65258859cc43ab338e2a81f880b011e4 (patch) | |
| tree | 5beb41dca40b1fa68041dfd0c86d981387c5af42 | |
| parent | e3f06c0127185ea72d51f06fe812031e459df463 (diff) | |
Removed indentation from commands (from <blockquote><literallayout> to
<para><screen>
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@760 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter02/install.xml | 50 | ||||
| -rw-r--r-- | chapter03/creatingdirs.xml | 63 | ||||
| -rw-r--r-- | chapter03/creatingfs.xml | 8 | ||||
| -rw-r--r-- | chapter03/mounting.xml | 16 | ||||
| -rw-r--r-- | chapter05/bash-inst.xml | 20 | ||||
| -rw-r--r-- | chapter05/binutils-inst.xml | 14 | ||||
| -rw-r--r-- | chapter05/bzip2-inst.xml | 22 | ||||
| -rw-r--r-- | chapter05/diffutils-inst.xml | 17 | ||||
| -rw-r--r-- | chapter05/fileutils-inst.xml | 19 | ||||
| -rw-r--r-- | chapter05/gcc-inst.xml | 36 | ||||
| -rw-r--r-- | chapter05/grep-inst.xml | 18 | ||||
| -rw-r--r-- | chapter05/gzip-inst.xml | 20 | ||||
| -rw-r--r-- | chapter05/introduction.xml | 8 | ||||
| -rw-r--r-- | chapter05/kernel-inst.xml | 29 | ||||
| -rw-r--r-- | chapter05/make-inst.xml | 13 | ||||
| -rw-r--r-- | chapter05/mawk-inst.xml | 22 | ||||
| -rw-r--r-- | chapter05/oldnsslib.xml | 16 | ||||
| -rw-r--r-- | chapter05/patch-inst.xml | 13 | ||||
| -rw-r--r-- | chapter05/proc.xml | 8 | ||||
| -rw-r--r-- | chapter05/pwdgroup.xml | 40 | ||||
| -rw-r--r-- | chapter05/sed-inst.xml | 18 | ||||
| -rw-r--r-- | chapter05/shellutils-inst.xml | 22 | ||||
| -rw-r--r-- | chapter05/tar-inst.xml | 27 | ||||
| -rw-r--r-- | chapter05/texinfo-inst.xml | 16 | ||||
| -rw-r--r-- | chapter05/textutils-inst.xml | 15 |
25 files changed, 292 insertions, 258 deletions
diff --git a/chapter02/install.xml b/chapter02/install.xml index d091763f0..07f72784c 100644 --- a/chapter02/install.xml +++ b/chapter02/install.xml @@ -13,9 +13,11 @@ section. To start with, change to the $LFS/usr/src directory by running: </para> -<blockquote><literallayout> - <userinput>cd $LFS/usr/src</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>cd $LFS/usr/src</userinput> +</screen> +</para> <para> If a file is tar'ed and gzip'ed, it is unpacked by @@ -23,10 +25,12 @@ running either one of the following two commands, depending on the filename: </para> -<blockquote><literallayout> - <userinput>tar xvzf filename.tar.gz</userinput> - <userinput>tar xvzf filename.tgz</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>tar xvzf filename.tar.gz</userinput> +<userinput>tar xvzf filename.tgz</userinput> +</screen> +</para> <para> @@ -34,9 +38,11 @@ If a file is tar'ed and bzip2'ed, it is unpacked by running: </para> -<blockquote><literallayout> - <userinput>bzcat filename.tar.bz2 | tar xv</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>bzcat filename.tar.bz2 | tar xv</userinput> +</screen> +</para> <para> Some tar programs (most of them nowadays but not all of them) are @@ -50,9 +56,11 @@ your host system decided to patch bzip2. If a file is just tar'ed, it is unpacked by running: </para> -<blockquote><literallayout> - <userinput>tar xvf filename.tar</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>tar xvf filename.tar</userinput> +</screen> +</para> <para> When an archive is unpacked, a new directory will be created under the @@ -73,17 +81,21 @@ can be used they need to be uncompressed first. If a file is gzip'ed, it is unpacked by running: </para> -<blockquote><literallayout> - <userinput>gunzip filename.gz</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>gunzip filename.gz</userinput> +</screen> +</para> <para> If a file is bzip2'ed, it is unpacked by running: </para> -<blockquote><literallayout> - <userinput>bunzip2 filename.bz2</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>bunzip2 filename.bz2</userinput> +</screen> +</para> <para> After a package has been installed, two things can be done with it: diff --git a/chapter03/creatingdirs.xml b/chapter03/creatingdirs.xml index 969b51859..d581f3ffd 100644 --- a/chapter03/creatingdirs.xml +++ b/chapter03/creatingdirs.xml @@ -8,33 +8,30 @@ url="http://www.pathname.com/fhs/">http://www.pathname.com/fhs/</ulink>. Issuing the following commands will create a default directory layout: </para> -<blockquote><literallayout> - <userinput>cd $LFS</userinput> - <userinput>mkdir -p bin boot dev/pts etc/opt home lib mnt proc - root sbin tmp var opt</userinput> - <userinput>for dirname in $LFS/usr $LFS/usr/local</userinput> - <userinput><literal> do</literal></userinput> - <userinput> mkdir $dirname</userinput> - <userinput> cd $dirname</userinput> - <userinput> mkdir bin etc include lib sbin share - src var</userinput> - <userinput> ln -s share/man man</userinput> - <userinput> ln -s share/doc doc</userinput> - <userinput> ln -s share/info info</userinput> - <userinput> cd $dirname/share</userinput> - <userinput> mkdir dict doc info locale man nls misc - terminfo zoneinfo</userinput> - <userinput> cd $dirname/share/man</userinput> - <userinput> mkdir man{1,2,3,4,5,6,7,8}</userinput> - <userinput>done</userinput> - <userinput>cd $LFS/var</userinput> - <userinput>mkdir -p lock log mail run spool tmp opt cache lib/misc - local</userinput> - <userinput>cd $LFS/opt</userinput> - <userinput>mkdir bin doc include info lib man</userinput> - <userinput>cd $LFS/usr</userinput> - <userinput>ln -s ../var/tmp tmp</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>cd $LFS</userinput> +<userinput>mkdir -p bin boot dev/pts etc/opt home lib mnt proc root sbin tmp var opt</userinput> +<userinput>for dirname in $LFS/usr $LFS/usr/local</userinput> +<userinput><literal> do</literal></userinput> +<userinput> mkdir $dirname</userinput> +<userinput> cd $dirname</userinput> +<userinput> mkdir bin etc include lib sbin share src var</userinput> +<userinput> ln -s share/man man</userinput> +<userinput> ln -s share/doc doc</userinput> +<userinput> ln -s share/info info</userinput> +<userinput> cd $dirname/share</userinput> +<userinput> mkdir dict doc info locale man nls misc terminfo zoneinfo</userinput> +<userinput> cd $dirname/share/man</userinput> +<userinput> mkdir man{1,2,3,4,5,6,7,8}</userinput> +<userinput>done</userinput> +<userinput>cd $LFS/var</userinput> +<userinput>mkdir -p lock log mail run spool tmp opt cache lib/misc local</userinput> +<userinput>cd $LFS/opt</userinput> +<userinput>mkdir bin doc include info lib man</userinput> +<userinput>cd $LFS/usr</userinput> +<userinput>ln -s ../var/tmp tmp</userinput> +</screen></para> <para> Normally, directories are created with permission mode 755, which isn't @@ -47,11 +44,13 @@ directory but cannot remove another user's files (the latter is caused by the so-called "sticky bit" - bit 1 of the 1777 bit mask). </para> -<blockquote><literallayout> - <userinput>cd $LFS &&</userinput> - <userinput>chmod 0750 root &&</userinput> - <userinput>chmod 1777 tmp var/tmp</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>cd $LFS &&</userinput> +<userinput>chmod 0750 root &&</userinput> +<userinput>chmod 1777 tmp var/tmp</userinput> +</screen> +</para> <para> Now that the directories are created, copy the source files that were diff --git a/chapter03/creatingfs.xml b/chapter03/creatingfs.xml index 14028202d..00130a99b 100644 --- a/chapter03/creatingfs.xml +++ b/chapter03/creatingfs.xml @@ -15,9 +15,11 @@ To create an ext2 file system, use the mke2fs command. The LFS partition is used as the only option to the command and the file system is created. </para> -<blockquote><literallayout> - <userinput>mke2fs /dev/xxx</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>mke2fs /dev/xxx</userinput> +</screen> +</para> <para> Replace "xxx" by the partition's designation (like hda11). diff --git a/chapter03/mounting.xml b/chapter03/mounting.xml index 562706186..d6c3b08e5 100644 --- a/chapter03/mounting.xml +++ b/chapter03/mounting.xml @@ -14,17 +14,21 @@ directory is chosen, just make sure you remember what you chose. Create the /mnt/lfs directory by running: </para> -<blockquote><literallayout> - <userinput>mkdir -p /mnt/lfs</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>mkdir -p /mnt/lfs</userinput> +</screen> +</para> <para> Now mount the LFS partition by running: </para> -<blockquote><literallayout> - <userinput>mount /dev/xxx /mnt/lfs</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>mount /dev/xxx /mnt/lfs</userinput> +</screen> +</para> <para> Replace <quote>xxx</quote> by the partition's designation (like hda11). diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml index a5d4420b8..f25dbaf21 100644 --- a/chapter05/bash-inst.xml +++ b/chapter05/bash-inst.xml @@ -5,16 +5,16 @@ Install Bash by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --enable-static-link --prefix=$LFS/usr - \</userinput> - <userinput> --bindir=$LFS/bin - --with-curses &&</userinput> - <userinput>make &&</userinput> - <userinput>make install &&</userinput> - <userinput>cd $LFS/bin &&</userinput> - <userinput>ln -s bash sh</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --enable-static-link --prefix=$LFS/usr \</userinput> +<userinput> --bindir=$LFS/bin --with-curses &&</userinput> +<userinput>make &&</userinput> +<userinput>make install &&</userinput> +<userinput>cd $LFS/bin &&</userinput> +<userinput>ln -s bash sh</userinput> +</screen> +</para> <para> If the make install phase ends with something along the lines of diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml index bcda9a2a7..81b4858ec 100644 --- a/chapter05/binutils-inst.xml +++ b/chapter05/binutils-inst.xml @@ -5,13 +5,13 @@ Install Binutils by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=$LFS/usr --disable-nls - &&</userinput> - <userinput>make -e LDFLAGS=-all-static tooldir=$LFS/usr - &&</userinput> - <userinput>make -e tooldir=$LFS/usr install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> +<userinput>make -e LDFLAGS=-all-static tooldir=$LFS/usr &&</userinput> +<userinput>make -e tooldir=$LFS/usr install</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml index 847b2637b..2eb26464e 100644 --- a/chapter05/bzip2-inst.xml +++ b/chapter05/bzip2-inst.xml @@ -5,16 +5,18 @@ Install Bzip2 by running the following commands: </para> -<blockquote><literallayout> - <userinput>sed \</userinput> - <userinput> s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) - \$(LDFLAGS) -o"/ \</userinput> - <userinput> Makefile | make -f - - LDFLAGS=-static &&</userinput> - <userinput>make PREFIX=$LFS/usr install &&</userinput> - <userinput>cd $LFS/usr/bin &&</userinput> - <userinput>mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>sed \</userinput> +<userinput> s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) +\$(LDFLAGS) -o"/ \</userinput> +<userinput> Makefile | make -f - +LDFLAGS=-static &&</userinput> +<userinput>make PREFIX=$LFS/usr install &&</userinput> +<userinput>cd $LFS/usr/bin &&</userinput> +<userinput>mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml index bff2e4813..e6e962bef 100644 --- a/chapter05/diffutils-inst.xml +++ b/chapter05/diffutils-inst.xml @@ -5,14 +5,15 @@ Install Diffutils by running the following commands: </para> -<blockquote><literallayout> - <userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 - &&</userinput> - <userinput>./configure --prefix=$LFS/usr &&</userinput> - <userinput>unset CPPFLAGS &&</userinput> - <userinput>make LDFLAGS=-static &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> +<userinput>./configure --prefix=$LFS/usr &&</userinput> +<userinput>unset CPPFLAGS &&</userinput> +<userinput>make LDFLAGS=-static &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml index 080ed0efa..3034e700d 100644 --- a/chapter05/fileutils-inst.xml +++ b/chapter05/fileutils-inst.xml @@ -5,15 +5,16 @@ Install Fileutils by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --disable-nls \</userinput> - <userinput> --prefix=$LFS/usr --libexecdir=$LFS/bin - --bindir=$LFS/bin &&</userinput> - <userinput>make LDFLAGS=-static &&</userinput> - <userinput>make install &&</userinput> - <userinput>cd $LFS/usr/bin &&</userinput> - <userinput>ln -s ../../bin/install</userinput> -</literallayout></blockquote> +<para><screen> +<userinput>./configure --disable-nls \</userinput> +<userinput> --prefix=$LFS/usr --libexecdir=$LFS/bin +--bindir=$LFS/bin &&</userinput> +<userinput>make LDFLAGS=-static &&</userinput> +<userinput>make install &&</userinput> +<userinput>cd $LFS/usr/bin &&</userinput> +<userinput>ln -s ../../bin/install</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index 3c76b821f..ea498ca45 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -5,25 +5,23 @@ Install GCC by running the following commands: </para> -<blockquote><literallayout> - <userinput>mkdir $LFS/usr/src/gcc-build &&</userinput> - <userinput>cd $LFS/usr/src/gcc-build &&</userinput> - <userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput> - <userinput> --enable-languages=c,c++ --disable-nls - \</userinput> - <userinput> --disable-shared - &&</userinput> - <userinput>make -e LDFLAGS=-static bootstrap &&</userinput> - <userinput>make prefix=$LFS/usr install &&</userinput> - <userinput>cd $LFS/lib &&</userinput> - <userinput>ln -s ../usr/bin/cpp - &&</userinput> - <userinput>cd $LFS/usr/lib &&</userinput> - <userinput>ln -s ../bin/cpp - &&</userinput> - <userinput>cd $LFS/usr/bin &&</userinput> - <userinput>ln -s gcc cc</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>mkdir $LFS/usr/src/gcc-build &&</userinput> +<userinput>cd $LFS/usr/src/gcc-build &&</userinput> +<userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput> +<userinput> --enable-languages=c,c++ --disable-nls \</userinput> +<userinput> --disable-shared &&</userinput> +<userinput>make -e LDFLAGS=-static bootstrap &&</userinput> +<userinput>make prefix=$LFS/usr install &&</userinput> +<userinput>cd $LFS/lib &&</userinput> +<userinput>ln -s ../usr/bin/cpp &&</userinput> +<userinput>cd $LFS/usr/lib &&</userinput> +<userinput>ln -s ../bin/cpp &&</userinput> +<userinput>cd $LFS/usr/bin &&</userinput> +<userinput>ln -s gcc cc</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml index 4a856e361..6b1058547 100644 --- a/chapter05/grep-inst.xml +++ b/chapter05/grep-inst.xml @@ -5,15 +5,15 @@ Install Grep by running the following commands: </para> -<blockquote><literallayout> - <userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 - &&</userinput> - <userinput>./configure --prefix=$LFS/usr --disable-nls - &&</userinput> - <userinput>unset CPPFLAGS &&</userinput> - <userinput>make LDFLAGS=-static &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> +<userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> +<userinput>unset CPPFLAGS &&</userinput> +<userinput>make LDFLAGS=-static &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml index 1a5aba83b..f1d5d1ca6 100644 --- a/chapter05/gzip-inst.xml +++ b/chapter05/gzip-inst.xml @@ -5,16 +5,16 @@ Before Gzip is installed, the gzip patch file needs to be unpacked. </para> -<blockquote><literallayout> - <userinput>patch -Np1 -i ../gzip-&gzip-version;.patch - &&</userinput> - <userinput>./configure --prefix=$LFS/usr &&</userinput> - <userinput>make LDFLAGS=-static &&</userinput> - <userinput>make install &&</userinput> - <userinput>cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip - $LFS/bin &&</userinput> - <userinput>rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>patch -Np1 -i ../gzip-&gzip-version;.patch &&</userinput> +<userinput>./configure --prefix=$LFS/usr &&</userinput> +<userinput>make LDFLAGS=-static &&</userinput> +<userinput>make install &&</userinput> +<userinput>cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin &&</userinput> +<userinput>rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml index 05278c75c..8729787e2 100644 --- a/chapter05/introduction.xml +++ b/chapter05/introduction.xml @@ -40,9 +40,11 @@ Before we start, make sure the LFS environment variable is setup properly if you decided to make use of it. Run the following: </para> -<blockquote><literallayout> - <userinput>echo $LFS</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>echo $LFS</userinput> +</screen> +</para> <para> Check to make sure the output contains the correct directory to the LFS diff --git a/chapter05/kernel-inst.xml b/chapter05/kernel-inst.xml index c02df1090..27af821bc 100644 --- a/chapter05/kernel-inst.xml +++ b/chapter05/kernel-inst.xml @@ -13,21 +13,20 @@ compile the packages that need the kernel. The kernel configuration file is created by running the following command: </para> -<blockquote><literallayout> - <userinput>patch -Np1 -i ../linux-&kernel-version;.patch - &&</userinput> - <userinput>make mrproper &&</userinput> - <userinput>yes "" | make config &&</userinput> - <userinput>make dep &&</userinput> - <userinput>cd $LFS/usr/include &&</userinput> - <userinput>cp -a ../src/linux/include/linux . &&</userinput> - <userinput>chown root.root $LFS/usr/include/linux -R - &&</userinput> - <userinput>mkdir asm &&</userinput> - <userinput>cp -a ../src/linux/include/asm/* asm &&</userinput> - <userinput>chown root.root $LFS/usr/include/asm -R</userinput> - -</literallayout></blockquote> +<para> +<screen> +<userinput>patch -Np1 -i ../linux-&kernel-version;.patch &&</userinput> +<userinput>make mrproper &&</userinput> +<userinput>yes "" | make config &&</userinput> +<userinput>make dep &&</userinput> +<userinput>cd $LFS/usr/include &&</userinput> +<userinput>cp -a ../src/linux/include/linux . &&</userinput> +<userinput>chown root.root $LFS/usr/include/linux -R &&</userinput> +<userinput>mkdir asm &&</userinput> +<userinput>cp -a ../src/linux/include/asm/* asm &&</userinput> +<userinput>chown root.root $LFS/usr/include/asm -R</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/make-inst.xml b/chapter05/make-inst.xml index 4e8929b94..e07c8205b 100644 --- a/chapter05/make-inst.xml +++ b/chapter05/make-inst.xml @@ -5,12 +5,13 @@ Install Make by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=$LFS/usr - --disable-nls &&</userinput> - <userinput>make LDFLAGS=-static &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> +<userinput>make LDFLAGS=-static &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/mawk-inst.xml b/chapter05/mawk-inst.xml index a1f731bd1..67171df72 100644 --- a/chapter05/mawk-inst.xml +++ b/chapter05/mawk-inst.xml @@ -5,17 +5,17 @@ Install Mawk by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure &&</userinput> - <userinput>sed \</userinput> - <userinput> s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) -\$(CFLAGS) \$(LDFLAGS) -o"/ \</userinput> - <userinput> Makefile | make - -f - LDFLAGS=-static &&</userinput> - <userinput>make BINDIR=$LFS/usr/bin \</userinput> - <userinput> MANDIR=$LFS/usr/share/man/man1 - install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure &&</userinput> +<userinput>sed \</userinput> +<userinput> s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) +\$(LDFLAGS) -o"/ \</userinput> +<userinput> Makefile | make -f - LDFLAGS=-static && </userinput> +<userinput>make BINDIR=$LFS/usr/bin \</userinput> +<userinput> MANDIR=$LFS/usr/share/man/man1 install</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/oldnsslib.xml b/chapter05/oldnsslib.xml index 87357d6e0..54d5f8a3f 100644 --- a/chapter05/oldnsslib.xml +++ b/chapter05/oldnsslib.xml @@ -9,9 +9,11 @@ and groupid's. You can check which C library version your normal Linux system uses by simply executing the library, like this: </para> -<blockquote><literallayout> - <userinput>/lib/libc.so.6</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>/lib/libc.so.6</userinput> +</screen> +</para> <para> The first line will give you the release version. Following lines contain @@ -19,9 +21,11 @@ interesting information. If you have Glibc-2.0.x installed on your starting distribution, copy the NSS library files by running: </para> -<blockquote><literallayout> - <userinput>cp -av /lib/libnss* $LFS/lib</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>cp -av /lib/libnss* $LFS/lib</userinput> +</screen> +</para> </sect1> diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml index b4e13ec63..3442d860b 100644 --- a/chapter05/patch-inst.xml +++ b/chapter05/patch-inst.xml @@ -5,12 +5,13 @@ Install Patch by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=$LFS/usr - &&</userinput> - <userinput>make LDFLAGS=-static &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=$LFS/usr &&</userinput> +<userinput>make LDFLAGS=-static &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/proc.xml b/chapter05/proc.xml index 27cea3ee5..3a13f2be3 100644 --- a/chapter05/proc.xml +++ b/chapter05/proc.xml @@ -13,9 +13,11 @@ the kernel itself. The proc file system is mounted under $LFS/proc by running the following command: </para> -<blockquote><literallayout> - <userinput>mount proc $LFS/proc -t proc</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>mount proc $LFS/proc -t proc</userinput> +</screen> +</para> </sect1> diff --git a/chapter05/pwdgroup.xml b/chapter05/pwdgroup.xml index 279e73e18..28e17442b 100644 --- a/chapter05/pwdgroup.xml +++ b/chapter05/pwdgroup.xml @@ -21,32 +21,36 @@ Create a new file <filename>$LFS/etc/passwd</filename> by running the following command: </para> -<blockquote><literallayout> - <userinput>echo "root:x:0:0:root:/root:/bin/bash" > - $LFS/etc/passwd</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>echo "root:x:0:0:root:/root:/bin/bash" > $LFS/etc/passwd +</userinput> +</screen> +</para> <para> Create a new file <filename>$LFS/etc/group</filename> by running the following: </para> -<literallayout> +<para> +<screen> <userinput>cat > $LFS/etc/group << "EOF"</userinput> - root:x:0: - bin:x:1: - sys:x:2: - kmem:x:3: - tty:x:4: - tape:x:5: - daemon:x:6: - floppy:x:7: - disk:x:8: - lp:x:9: - dialout:x:10: - audio:x:11: +root:x:0: +bin:x:1: +sys:x:2: +kmem:x:3: +tty:x:4: +tape:x:5: +daemon:x:6: +floppy:x:7: +disk:x:8: +lp:x:9: +dialout:x:10: +audio:x:11: <userinput>EOF</userinput> -</literallayout> +</screen> +</para> </sect1> diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml index 7be838ca6..c410c0d88 100644 --- a/chapter05/sed-inst.xml +++ b/chapter05/sed-inst.xml @@ -5,15 +5,15 @@ Install Sed by running the following commands: </para> -<blockquote><literallayout> - <userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 - &&</userinput> - <userinput>./configure --prefix=$LFS/usr - --bindir=$LFS/bin &&</userinput> - <userinput>unset CPPFLAGS &&</userinput> - <userinput>make LDFLAGS=-static &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> +<userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &&</userinput> +<userinput>unset CPPFLAGS &&</userinput> +<userinput>make LDFLAGS=-static &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml index 618991830..0fa096a4c 100644 --- a/chapter05/shellutils-inst.xml +++ b/chapter05/shellutils-inst.xml @@ -5,17 +5,17 @@ Before Sh-utils is installed, the sh-utils patch file needs to be unpacked. </para> -<blockquote><literallayout> - <userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch - &&</userinput> - <userinput>./configure --prefix=$LFS/usr - --disable-nls &&</userinput> - <userinput>make LDFLAGS=-static &&</userinput> - <userinput>make install &&</userinput> - <userinput>cd $LFS/usr/bin &&</userinput> - <userinput>mv date echo false pwd stty $LFS/bin &&</userinput> - <userinput>mv su true uname hostname $LFS/bin</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch &&</userinput> +<userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> +<userinput>make LDFLAGS=-static &&</userinput> +<userinput>make install &&</userinput> +<userinput>cd $LFS/usr/bin &&</userinput> +<userinput>mv date echo false pwd stty $LFS/bin &&</userinput> +<userinput>mv su true uname hostname $LFS/bin</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml index c9ae8ca26..175cab6e9 100644 --- a/chapter05/tar-inst.xml +++ b/chapter05/tar-inst.xml @@ -12,24 +12,25 @@ for gzip files). Apply the patch by running the following command: </para> -<blockquote><literallayout> - <userinput>cd src &&</userinput> - <userinput>patch -i ../../gnutarpatch.txt &&</userinput> - <userinput>cd ..</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>cd src &&</userinput> +<userinput>patch -i ../../gnutarpatch.txt &&</userinput> +<userinput>cd ..</userinput> +</screen> +</para> <para> Install Tar by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=$LFS/usr - --disable-nls \</userinput> - <userinput> --libexecdir=$LFS/usr/bin - --bindir=$LFS/bin && </userinput> - <userinput>make LDFLAGS=-static &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=$LFS/usr --disable-nls \</userinput> +<userinput> --libexecdir=$LFS/usr/bin --bindir=$LFS/bin && </userinput> +<userinput>make LDFLAGS=-static &&</userinput> +<userinput>make install</userinput> +</screen></para> </sect2> diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml index 358f09f66..2fed3e3b0 100644 --- a/chapter05/texinfo-inst.xml +++ b/chapter05/texinfo-inst.xml @@ -5,14 +5,14 @@ Install Texinfo by running the following commands: </para> -<blockquote><literallayout> - <userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch - &&</userinput> - <userinput>./configure --prefix=$LFS/usr - --disable-nls &&</userinput> - <userinput>make LDFLAGS=-static &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch &&</userinput> +<userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> +<userinput>make LDFLAGS=-static &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter05/textutils-inst.xml b/chapter05/textutils-inst.xml index c21d6cd53..d0485f4d7 100644 --- a/chapter05/textutils-inst.xml +++ b/chapter05/textutils-inst.xml @@ -5,13 +5,14 @@ Install Textutils by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=$LFS/usr - --disable-nls &&</userinput> - <userinput>make LDFLAGS=-static &&</userinput> - <userinput>make install &&</userinput> - <userinput>mv $LFS/usr/bin/cat $LFS/bin</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> +<userinput>make LDFLAGS=-static &&</userinput> +<userinput>make install &&</userinput> +<userinput>mv $LFS/usr/bin/cat $LFS/bin</userinput> +</screen> +</para> </sect2> |