diff options
| -rw-r--r-- | chapter01/changelog.xml | 6 | ||||
| -rw-r--r-- | chapter05/gcc-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/bash-inst.xml | 1 | ||||
| -rw-r--r-- | chapter06/createfiles.xml | 15 | ||||
| -rw-r--r-- | chapter06/gzip-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/makedev-inst.xml | 13 | ||||
| -rw-r--r-- | chapter06/man-exp.xml | 7 | ||||
| -rw-r--r-- | chapter06/man-inst.xml | 8 | ||||
| -rw-r--r-- | chapter06/sysvinit-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/utillinux-inst.xml | 2 | ||||
| -rw-r--r-- | index.xml | 4 |
11 files changed, 35 insertions, 27 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index d6d330f6a..15e2e697c 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -52,6 +52,12 @@ </itemizedlist> </para></listitem> +<listitem><para>September 2nd, 2002 [timothy]: Chapter 06 - Bash: Removed +creation of sh symlink. Creating the bash and sh symlinks: Added /bin/bash +symlink, symlinked sh to bash. Gzip, Sysvinit, Util-Linux: Shortened cp +command. Makedev: Removed /bin/bash creation and removal. Man: Modified sed +statement to edit less call, so SGR will work.</para></listitem> + <listitem><para>September 1st, 2002 [timothy]: Chapter 06 - About debugging symbols: Removed info. about stripping /static. Man: Added sed statement to prevent groff from using SGR escape sequences.</para></listitem> diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index 661726347..c02291141 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -19,7 +19,7 @@ mkdir ../gcc-build && cd ../gcc-build && ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \ --disable-nls --disable-shared --enable-threads=posix && -echo "#define HAVE_GAS_HIDDEN 1" >> gcc/auto-host.h && +echo "#define HAVE_GAS_HIDDEN 1" >> gcc/auto-host.h && make BOOT_LDFLAGS=-static bootstrap && make prefix=$LFS/static install && ln -s gcc $LFS/static/bin/cc</userinput></screen></para> diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml index ea821923e..88f6aa874 100644 --- a/chapter06/bash-inst.xml +++ b/chapter06/bash-inst.xml @@ -6,7 +6,6 @@ <para><screen><userinput>./configure --prefix=/usr --bindir=/bin && make && make install && -ln -sf bash /bin/sh && exec /bin/bash --login</userinput></screen></para> </sect2> diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml index 8c4b76b2d..d71a19491 100644 --- a/chapter06/createfiles.xml +++ b/chapter06/createfiles.xml @@ -1,15 +1,16 @@ <sect1 id="ch06-createfiles"> -<title>Creating the /bin/sh symlink</title> +<title>Creating the bash and sh symlinks</title> <?dbhtml filename="createfiles.html" dir="chapter06"?> -<para>Some programs hard-wire paths that don't exist yet. The only one -which may cause us trouble is <filename>/bin/sh</filename>. -We therefore create this for the time being and replace it -properly when the bash package is (re)installed.</para> +<para>Some programs hard-wire paths to programs which don't exist yet. In +order to satisfy these programs, we create the <filename>/bin/bash</filename> +and <filename>/bin/sh</filename> symlinks.</para> -<para>Create the /bin/sh symlink by running the following commands:</para> +<para>Create the /bin/bash and /bin/sh symlinks by running the following +commands:</para> -<para><screen><userinput>ln -s /static/bin/bash /bin/sh</userinput></screen></para> +<para><screen><userinput>ln -s /static/bin/bash /bin/bash && +ln -s bash /bin/sh</userinput></screen></para> </sect1> diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml index 30581ad63..c4048e571 100644 --- a/chapter06/gzip-inst.xml +++ b/chapter06/gzip-inst.xml @@ -4,7 +4,7 @@ <para>Install Gzip by running the following commands:</para> <para><screen><userinput>./configure --prefix=/usr && -cp gzexe.in gzexe.in.backup && +cp gzexe.in{,.backup} && sed 's%"BINDIR"%/bin%' gzexe.in.backup > gzexe.in && make && make install && diff --git a/chapter06/makedev-inst.xml b/chapter06/makedev-inst.xml index 6fa63a064..a5d093dc5 100644 --- a/chapter06/makedev-inst.xml +++ b/chapter06/makedev-inst.xml @@ -1,13 +1,12 @@ <sect2> <title>Creating devices</title> -<para>Note: the MAKEDEV-&makedev-version;.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-&makedev-version;.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><screen><userinput>ln -s /static/bin/bash /bin/bash && -cp MAKEDEV-&makedev-version; /dev/MAKEDEV && +<para><screen><userinput>cp MAKEDEV-&makedev-version; /dev/MAKEDEV && cd /dev && chmod 754 MAKEDEV</userinput></screen></para> @@ -15,12 +14,10 @@ chmod 754 MAKEDEV</userinput></screen></para> can run one of two commands:</para> <para>If you do not intend to use devpts, run:</para> -<para><screen><userinput>./MAKEDEV -v generic && -rm /bin/bash</userinput></screen></para> +<para><screen><userinput>./MAKEDEV -v generic</userinput></screen></para> <para>If you do intend to use devpts, then run:</para> -<para><screen><userinput>./MAKEDEV -v generic-nopty && -rm /bin/bash</userinput></screen></para> +<para><screen><userinput>./MAKEDEV -v generic-nopty</userinput></screen></para> <para>Note that if you aren't sure, it's best to use the <userinput>./MAKEDEV -v generic</userinput> command as this will diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml index 00c41e2ae..fc09310b2 100644 --- a/chapter06/man-exp.xml +++ b/chapter06/man-exp.xml @@ -8,9 +8,10 @@ where a program is found. By appending /usr/bin:/bin to PATH for the ./configure command, we make sure that man doesn't use the /static versions of our programs.</para> -<para><userinput>sed -e '/^NROFF/s/-mandoc/-c -mandoc/'</userinput>: -This prevents groff from using SGR (Set Graphics Rendition) escape -sequences on our man pages.</para> +<para><userinput>sed '/^PAGER/s/-is/-isR/'</userinput>: +The version of groff we installed supports SGR (Set Graphics Rendition) +escape sequences. In order for our man pages to display properly, we +add the R argument to the call for the less pager.</para> </sect2> diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index 38fdcd8e4..0c72b3787 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -7,10 +7,14 @@ ./configure -default -confdir=/etc && make && cp src/man.conf{,.backup} && -sed -e '/^NROFF/s/-mandoc/-c -mandoc/' \ - src/man.conf.backup > src/man.conf && +sed '/^PAGER/s/-is/-isR/' \ + src/man.conf.backup > src/man.conf && make install</userinput></screen></para> +<para>Note: If you wish to disable SGR escape sequences, you should +edit the man.conf file and add the <userinput>-c</userinput> argument +to nroff.</para> + <para>You may want to take a look at the man hint at <ulink url="&hints-root;man.txt"/> which deals with formatting and compression issues for man pages.</para> diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml index 65d15bd35..a6c846260 100644 --- a/chapter06/sysvinit-inst.xml +++ b/chapter06/sysvinit-inst.xml @@ -10,7 +10,7 @@ that the sentence reads "Sending processes started by init the TERM signal", by running the following commands. If you don't want to change it, skip it.</para> -<para><screen><userinput>cp src/init.c src/init.c.backup && +<para><screen><userinput>cp src/init.c{,.backup} && sed 's/Sending processes/Sending processes started by init/g' \ src/init.c.backup > src/init.c</userinput></screen></para> diff --git a/chapter06/utillinux-inst.xml b/chapter06/utillinux-inst.xml index b3b114ffd..1f6ee9f9c 100644 --- a/chapter06/utillinux-inst.xml +++ b/chapter06/utillinux-inst.xml @@ -5,7 +5,7 @@ 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>cp hwclock/hwclock.c hwclock/hwclock.c.backup && +<para><screen><userinput>cp hwclock/hwclock.c{,.backup} && sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \ hwclock/hwclock.c.backup > hwclock/hwclock.c && mkdir -p /var/lib/hwclock</userinput></screen></para> @@ -4,8 +4,8 @@ <!ENTITY book SYSTEM "book/book.xml"> -<!ENTITY version "20020901"> -<!ENTITY releasedate "September 1st, 2002"> +<!ENTITY version "20020902"> +<!ENTITY releasedate "September 2nd, 2002"> <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org"> <!ENTITY http-root "http://ftp.linuxfromscratch.org"> |