diff options
Diffstat (limited to 'chapter06')
| -rw-r--r-- | chapter06/binutils.xml | 4 | ||||
| -rw-r--r-- | chapter06/coreutils.xml | 8 | ||||
| -rw-r--r-- | chapter06/flex.xml | 8 | ||||
| -rw-r--r-- | chapter06/gcc.xml | 5 | ||||
| -rw-r--r-- | chapter06/glibc.xml | 8 | ||||
| -rw-r--r-- | chapter06/iproute2.xml | 4 | ||||
| -rw-r--r-- | chapter06/libol.xml | 1 | ||||
| -rw-r--r-- | chapter06/man.xml | 2 | ||||
| -rw-r--r-- | chapter06/pwdgroup.xml | 6 | ||||
| -rw-r--r-- | chapter06/readjusting.xml | 6 | ||||
| -rw-r--r-- | chapter06/readline.xml | 1 | ||||
| -rw-r--r-- | chapter06/shadow.xml | 9 | ||||
| -rw-r--r-- | chapter06/syslogng.xml | 4 | ||||
| -rw-r--r-- | chapter06/sysvinit.xml | 4 | ||||
| -rw-r--r-- | chapter06/udev.xml | 3 | ||||
| -rw-r--r-- | chapter06/util-linux.xml | 3 | ||||
| -rw-r--r-- | chapter06/vim.xml | 4 | ||||
| -rw-r--r-- | chapter06/zlib.xml | 1 |
18 files changed, 44 insertions, 37 deletions
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index 197b51d3b..f6d78b896 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -33,7 +33,8 @@ cd ../binutils-build</userinput></screen> <para>Now prepare Binutils for compilation:</para> -<screen><userinput>../binutils-&binutils-version;/configure --prefix=/usr --enable-shared</userinput></screen> +<screen><userinput>../binutils-&binutils-version;/configure --prefix=/usr \ + --enable-shared</userinput></screen> <para>Compile the package:</para> @@ -41,6 +42,7 @@ cd ../binutils-build</userinput></screen> <para>Test the results:</para> +<!--NEW--> <screen><userinput>make -k check</userinput></screen> <para>The test suite notes from <xref linkend="ch-tools-binutils-pass2"/> are still diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 57a6f0424..4863dffe0 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -28,7 +28,8 @@ <para>Apply another patch:</para> -<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch</userinput></screen> +<screen><userinput>patch -Np1 -i \ + ../coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch</userinput></screen> <para>Now prepare Coreutils for compilation:</para> @@ -63,10 +64,9 @@ echo "dummy:x:1000:1000:::/bin/bash" >> /etc/passwd</userinput></screen> <para>And move some programs to their proper locations:</para> <screen><userinput>mv /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin -mv /usr/bin/{date,echo,false,head,install,ln,ls} /bin -mv /usr/bin/{mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin +mv /usr/bin/{date,echo,false,head,hostname,install,ln} /bin +mv /usr/bin/{ls,mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin mv /usr/bin/{sleep,stty,test,touch,true,uname} /bin -mv /usr/bin/hostname /bin mv /usr/bin/chroot /usr/sbin</userinput></screen> <para>Create a symlink:</para> diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 24be45365..e69ad90bf 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -51,14 +51,14 @@ <para>Create a lex script:</para> -<screen><userinput>cat > /usr/bin/lex << "EOF"</userinput> -#!/bin/sh +<screen><userinput>cat > /usr/bin/lex << "EOF" +<literal>#!/bin/sh # Begin /usr/bin/lex exec /usr/bin/flex -l "$@" -# End /usr/bin/lex -<userinput>EOF +# End /usr/bin/lex</literal> +EOF chmod 755 /usr/bin/lex</userinput></screen> </sect2> diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 71eda302d..c48378f67 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -42,8 +42,9 @@ cd ../gcc-build</userinput></screen> <para>Now prepare GCC for compilation:</para> <screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \ - --libexecdir=/usr/lib --enable-shared --enable-threads=posix \ - --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++</userinput></screen> + --libexecdir=/usr/lib --enable-shared \ + --enable-threads=posix --enable-__cxa_atexit \ + --enable-clocale=gnu --enable-languages=c,c++</userinput></screen> <para>Compile the package:</para> diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index be6a4935a..808789744 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -93,7 +93,7 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen> following:</para> <screen><userinput>cat > /etc/nsswitch.conf << "EOF" -# Begin /etc/nsswitch.conf +<literal># Begin /etc/nsswitch.conf passwd: files group: files @@ -107,7 +107,7 @@ services: files ethers: files rpc: files -# End /etc/nsswitch.conf +# End /etc/nsswitch.conf</literal> EOF</userinput></screen> <para>To find out what time zone you're in, run the following script:</para> @@ -129,12 +129,12 @@ EOF</userinput></screen> following:</para> <screen><userinput>cat > /etc/ld.so.conf << "EOF" -# Begin /etc/ld.so.conf +<literal># Begin /etc/ld.so.conf /usr/local/lib /opt/lib -# End /etc/ld.so.conf +# End /etc/ld.so.conf</literal> EOF</userinput></screen> </sect2> diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index 38d4ea099..1d1a48fef 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -31,6 +31,7 @@ <screen><userinput>patch -Np1 -i ../iproute2-&iproute2-patch-version;-remove_db-1.patch</userinput></screen> + <!--NEW--> <para>The patch below fixes the issue with the newer versions of findutils, the issue will give an error message it options are not in the proper order. This patch corrects this issue for IPRoute2.</para> @@ -46,7 +47,8 @@ <screen><userinput>make SBINDIR=/sbin</userinput></screen> <para>Now install it:</para> - + + <!--NEW--> <screen><userinput>make install SBINDIR=/sbin</userinput></screen> </sect2> diff --git a/chapter06/libol.xml b/chapter06/libol.xml index d601466db..dd38ae894 100644 --- a/chapter06/libol.xml +++ b/chapter06/libol.xml @@ -24,6 +24,7 @@ <para>Prepare Libol for compilation</para> +<!--NEW--> <screen><userinput>./configure --prefix=/usr</userinput></screen> <para>Compile Libol:</para> diff --git a/chapter06/man.xml b/chapter06/man.xml index 1d88e3fd1..39241b958 100644 --- a/chapter06/man.xml +++ b/chapter06/man.xml @@ -42,6 +42,8 @@ <screen><userinput>make install</userinput></screen> +<para>For some internazionalitation issues, see testing.</para> + </sect2> diff --git a/chapter06/pwdgroup.xml b/chapter06/pwdgroup.xml index a2c6d98ff..f52de7043 100644 --- a/chapter06/pwdgroup.xml +++ b/chapter06/pwdgroup.xml @@ -10,13 +10,13 @@ <para>Create the <filename>/etc/passwd</filename> file:</para> <screen><userinput>cat > /etc/passwd << "EOF" -root:x:0:0:root:/root:/bin/bash +<literal>root:x:0:0:root:/root:/bin/bash</literal> EOF</userinput></screen> <para>Create the <filename>/etc/group</filename> file:</para> <screen><userinput>cat > /etc/group << "EOF" -root:x:0: +<literal>root:x:0: bin:x:1: sys:x:2: kmem:x:3: @@ -30,7 +30,7 @@ dialout:x:10: audio:x:11: video:x:12: utmp:x:13: -usb:x:14: +usb:x:14:</literal> EOF</userinput></screen> <para>Start a new shell:</para> diff --git a/chapter06/readjusting.xml b/chapter06/readjusting.xml index 61b2fe9c8..6b9b61619 100644 --- a/chapter06/readjusting.xml +++ b/chapter06/readjusting.xml @@ -4,7 +4,7 @@ %general-entities; ]> <sect1 id="ch-system-readjusting"> -<title>Rea-djusting the Toolchain</title> +<title>Re-adjusting the Toolchain</title> <?dbhtml filename="readjusting.html"?> <para>Install the adjusted linker by running the following from within the @@ -14,11 +14,9 @@ <para>Amend the GCC specs file:</para> -<!-- Ampersands are needed to allow cut and paste --> - <screen><userinput>perl -pi -e 's@ /tools/lib/ld-linux.so.2@ /lib/ld-linux.so.2@g;' \ -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/@g;' \ - `gcc --print-file specs`</userinput></screen> + `gcc --print-file specs`</userinput></screen> <caution><para>Perform a simple sanity check:</para> diff --git a/chapter06/readline.xml b/chapter06/readline.xml index 3a2910f7d..3e82cbfc2 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -22,6 +22,7 @@ <sect2 role="installation"> <title>Installation of Readline</title> +<!-- NEW set of commands--> <para>Apply a patch.</para> <screen><userinput>patch -Np1 -i ../readline-&readline-version;-fixes-1.patch</userinput></screen> diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml index 238de4345..ae11d8c31 100644 --- a/chapter06/shadow.xml +++ b/chapter06/shadow.xml @@ -53,13 +53,10 @@ sed -i '/groups/d' man/Makefile</userinput></screen> <screen><userinput>mv /usr/bin/passwd /bin</userinput></screen> -<para>Move a library:</para> +<para>Move the library:</para> -<screen><userinput>mv /lib/libshadow.*a /usr/lib</userinput></screen> - -<para>Create the following symlinks:</para> - -<screen><userinput>rm /lib/libshadow.so +<screen><userinput>mv /lib/libshadow.*a /usr/lib +rm /lib/libshadow.so ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> <para>Create a dir:</para> diff --git a/chapter06/syslogng.xml b/chapter06/syslogng.xml index 6af059199..f4b3bbb92 100644 --- a/chapter06/syslogng.xml +++ b/chapter06/syslogng.xml @@ -43,7 +43,7 @@ <screen><userinput>mkdir -p /etc/syslog-ng cat > /etc/syslog-ng/syslog-ng.conf << "EOF" -# Begin /etc/syslog-ng/syslog-ng.conf +<literal># Begin /etc/syslog-ng/syslog-ng.conf options { sync (0); time_reopen (10); @@ -114,7 +114,7 @@ log { source(src); filter(f_emergency); destination(console); }; log { source(src); filter(f_everything); destination(everything); }; log { source(src); destination(console_all); }; -# END /etc/syslog-ng/syslog-ng.conf +# END /etc/syslog-ng/syslog-ng.conf</literal> EOF</userinput></screen> </sect2> diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml index 34f59ff95..3860d1188 100644 --- a/chapter06/sysvinit.xml +++ b/chapter06/sysvinit.xml @@ -43,7 +43,7 @@ <para>Create a <filename>/etc/inittab</filename> file:</para> <screen><userinput>cat > /etc/inittab << "EOF" -# Begin /etc/inittab +<literal># Begin /etc/inittab id:3:initdefault: @@ -68,7 +68,7 @@ su:S016:once:/sbin/sulogin 5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600 6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600 -# End /etc/inittab +# End /etc/inittab</literal> EOF</userinput></screen> </sect2> diff --git a/chapter06/udev.xml b/chapter06/udev.xml index 5d8cf5351..75a3232b1 100644 --- a/chapter06/udev.xml +++ b/chapter06/udev.xml @@ -32,7 +32,8 @@ <para>Install our configuration files:</para> -<screen><userinput>cp ../udev-config-2.permissions /etc/udev/permissions.d/25-lfs.permissions +<screen><userinput>cp ../udev-config-2.permissions \ + /etc/udev/permissions.d/25-lfs.permissions cp ../udev-config-1.rules /etc/udev/rules.d/25-lfs.rules</userinput></screen> <para>Create the full compliment of device nodes:</para> diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 3e1ca3082..2ef51e632 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -24,7 +24,8 @@ <para>Issue a sed sustitution:</para> -<screen><userinput>sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' hwclock/hwclock.c +<screen><userinput>sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' \ + hwclock/hwclock.c mkdir -p /var/lib/hwclock</userinput></screen> </sect2> diff --git a/chapter06/vim.xml b/chapter06/vim.xml index 537176681..2732e9fd2 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -60,7 +60,7 @@ following patch fixes the problem:</para> the following:</para> <screen><userinput>cat > /etc/vimrc << "EOF" -" Begin /etc/vimrc +<literal>" Begin /etc/vimrc set nocompatible set backspace=2 @@ -70,7 +70,7 @@ if (&term == "iterm") || (&term == "putty") set background=dark endif -" End /etc/vimrc +" End /etc/vimrc</literal> EOF</userinput></screen> <!-- XXX: the ascii-only files are considered to be in utf-8 - that's not what diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml index 80c58029c..1bd923cd3 100644 --- a/chapter06/zlib.xml +++ b/chapter06/zlib.xml @@ -22,6 +22,7 @@ <sect2 role="installation"> <title>Installation of Zlib</title> +<!-- NEW set of commands--> <para>Prepare Zlib for compilation:</para> <screen><userinput>./configure --prefix=/usr --shared --libdir=/lib</userinput></screen> |