diff options
| -rw-r--r-- | Attic/appendixc/man-patch.xml | 4 | ||||
| -rw-r--r-- | Attic/appendixc/packages.xml | 1 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 2 | ||||
| -rw-r--r-- | chapter04/man-patch.xml | 4 | ||||
| -rw-r--r-- | chapter04/packages.xml | 1 | ||||
| -rw-r--r-- | chapter06/man-exp.xml | 2 | ||||
| -rw-r--r-- | chapter06/man-inst.xml | 7 | ||||
| -rw-r--r-- | chapter06/shadowpwd-inst.xml | 5 | ||||
| -rw-r--r-- | chapter06/sysvinit-inst.xml | 6 | ||||
| -rw-r--r-- | index.xml | 3 |
10 files changed, 14 insertions, 21 deletions
diff --git a/Attic/appendixc/man-patch.xml b/Attic/appendixc/man-patch.xml deleted file mode 100644 index 3a75d3a99..000000000 --- a/Attic/appendixc/man-patch.xml +++ /dev/null @@ -1,4 +0,0 @@ -Man Patch (&man-version;): -<ulink url="&ftp;/">&ftp;/</ulink> -<ulink url="&http;/">&http;/</ulink> - diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml index f0ed41ae3..66554d64b 100644 --- a/Attic/appendixc/packages.xml +++ b/Attic/appendixc/packages.xml @@ -39,7 +39,6 @@ package quicker.</para> &ac-less; &ac-groff; &ac-man; -&ac-man-patch; &ac-perl; &ac-m4; &ac-autoconf; diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index b861dc84b..828d0b684 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -27,6 +27,8 @@ </para></listitem> +<listitem><para>Man patch replaced with sed command.</para></listitem> + <listitem><para>Changed tar patch to use -j for bzip2 files instead of -y in order to be compatible with next tar release. Also renamed patch file to tar-1.13.patch</para></listitem> diff --git a/chapter04/man-patch.xml b/chapter04/man-patch.xml deleted file mode 100644 index 3b191c374..000000000 --- a/chapter04/man-patch.xml +++ /dev/null @@ -1,4 +0,0 @@ -Man Patch (&man-version;) - &man-patch-size;: -<ulink url="&ftp;/man-&man-version;.patch.bz2">&ftp;/man-&man-version;.patch.bz2</ulink> -<ulink url="&http;/man-&man-version;.patch.bz2">&http;/man-&man-version;.patch.bz2</ulink> - diff --git a/chapter04/packages.xml b/chapter04/packages.xml index 7caad0673..60cd2620a 100644 --- a/chapter04/packages.xml +++ b/chapter04/packages.xml @@ -40,7 +40,6 @@ &c3-less; &c3-groff; &c3-man; -&c3-man-patch; &c3-perl; &c3-m4; &c3-autoconf; diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml index 02f3f092a..b7ab46db4 100644 --- a/chapter06/man-exp.xml +++ b/chapter06/man-exp.xml @@ -1,7 +1,7 @@ <sect2> <title>Command explanations</title> -<para><userinput>patch -Np1 -i ../man-1.5i2.patch:</userinput> This patch +<para><userinput>for ... sed ... done:</userinput> This construct 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> diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index c2eba71e2..963a083ca 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -1,9 +1,12 @@ <sect2> <title>Installation of Man</title> -<para>Before Man is installed, the man patch file needs to be unpacked.</para> +<para>Run the following commands to install man:</para> -<para><screen><userinput>patch -Np1 -i ../man-&man-version;.patch &&</userinput> +<para><screen><userinput>for i in configure src/Makefile.in src/makewhatis.sh</userinput> +<userinput>do sed s/gawk/awk/g $i > $i.fixed</userinput> +<userinput>mv $i.fixed $i</userinput> +<userinput>done</userinput> <userinput>./configure -default &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput></screen></para> diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index a0921ba07..edcddfad4 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/chapter06/shadowpwd-inst.xml @@ -4,8 +4,9 @@ <para>Install the Shadow Password Suite by running the following commands:</para> -<para><screen><userinput>mv src/useradd.c useradd.c.temp &&</userinput> -<userinput>sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' useradd.c.temp > src/useradd.c &&</userinput> + +<para><screen><userinput>sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' src/useradd.c > useradd.c.temp &&</userinput> +<userinput>mv useradd.c.temp src/useradd.c &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml index a772e7ad3..d534cc4f4 100644 --- a/chapter06/sysvinit-inst.xml +++ b/chapter06/sysvinit-inst.xml @@ -12,9 +12,9 @@ processes started by init the TERM signal".</para> <para>Install Sysvinit by running the following commands:</para> -<para><screen><userinput>mv src/init.c init.c.temp &&</userinput> -<userinput>sed 's/\(.*\)\(Sending processes\)\(.*\) \</userinput> -<userinput> /\1\2 started by init\3/' init.c.temp > src/init.c &&</userinput> +<para><screen><userinput>sed 's/\(.*\)\(Sending processes\)\(.*\) \</userinput> +<userinput> /\1\2 started by init\3/' src/init.c > init.c.temp &&</userinput> +<userinput>mv init.c.temp src/init.c &&</userinput> <userinput>make -C src &&</userinput> <userinput>make -C src install</userinput></screen></para> @@ -104,7 +104,6 @@ <!ENTITY c3-less SYSTEM "chapter3/less.xml"> <!ENTITY c3-groff SYSTEM "chapter3/groff.xml"> <!ENTITY c3-man SYSTEM "chapter3/man.xml"> -<!ENTITY c3-man-patch SYSTEM "chapter3/man-patch.xml"> <!ENTITY c3-perl SYSTEM "chapter3/perl.xml"> <!ENTITY c3-m4 SYSTEM "chapter3/m4.xml"> <!ENTITY c3-autoconf SYSTEM "chapter3/autoconf.xml"> @@ -491,7 +490,6 @@ <!ENTITY ac-less SYSTEM "appendixc/less.xml"> <!ENTITY ac-groff SYSTEM "appendixc/groff.xml"> <!ENTITY ac-man SYSTEM "appendixc/man.xml"> -<!ENTITY ac-man-patch SYSTEM "appendixc/man-patch.xml"> <!ENTITY ac-perl SYSTEM "appendixc/perl.xml"> <!ENTITY ac-m4 SYSTEM "appendixc/m4.xml"> <!ENTITY ac-autoconf SYSTEM "appendixc/autoconf.xml"> @@ -705,7 +703,6 @@ <!ENTITY man-version "1.5i2"> <!ENTITY man-size "158 KB"> -<!ENTITY man-patch-size "1 KB"> <!ENTITY man-compsize "man MB"> <!ENTITY man-time "man minutes"> |