Added sh-utils patch in chapter 5 to solve static linking problems on a

few platforms.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@551 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

6 files changed, 21 insertions, 3 deletions

diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml
index 0bcfb341c..21055e243 100644
--- a/Attic/appendixc/packages.xml
+++ b/Attic/appendixc/packages.xml
@@ -24,6 +24,7 @@ package quicker.
 &ac-make;
 &ac-sed;
 &ac-shellutils;
+&ac-shellutils-patch;
 &ac-tar;
 &ac-tar-patch;
 &ac-textutils;
diff --git a/Attic/appendixc/shellutils-patch.xml b/Attic/appendixc/shellutils-patch.xml
new file mode 100644
index 000000000..cc596d870
--- /dev/null
+++ b/Attic/appendixc/shellutils-patch.xml
@@ -0,0 +1,6 @@
+Shellutils Patch (&sh-utils-version;):
+<ulink url="&ftp;/">
+&ftp;/</ulink>
+<ulink url="&http;/">
+&http;/</ulink>
+
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index d20e8d8ad..d54419097 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -18,6 +18,7 @@
 &c3-make;
 &c3-sed;
 &c3-shellutils;
+&c3-shellutils-patch;
 &c3-tar;
 &c3-tar-patch;
 &c3-textutils;
diff --git a/chapter04/shellutils-patch.xml b/chapter04/shellutils-patch.xml
new file mode 100644
index 000000000..997be2561
--- /dev/null
+++ b/chapter04/shellutils-patch.xml
@@ -0,0 +1,6 @@
+Shellutils Patch (&sh-utils-version;) 1 KB:
+<ulink url="&ftp;/sh-utils-&sh-utils-version;.patch.bz2">
+&ftp;/gzip-&sh-utils-version;.patch.bz2</ulink>
+<ulink url="&http;/sh-utils-&sh-utils-version;.patch.bz2">
+&http;/gzip-&sh-utils-version;.patch.bz2</ulink>
+
diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml
index 3da0e0b18..b581e2318 100644
--- a/chapter05/shellutils-inst.xml
+++ b/chapter05/shellutils-inst.xml
@@ -2,10 +2,12 @@
 <title>Installation of Sh-utils</title>
 
 <para>
-Install Shellutils by running the following commands:
+Before Sh-utils is installed, the sh-utils patch file needs to be unpacked.
 </para>
 
 <blockquote><literallayout>
+	<userinput>patch -Np1 -i ../sh-utils-2.0.patch
+		&amp;&amp;</userinput>
 	<userinput>./configure --prefix=$LFS/usr 
 		--disable-nls &amp;&amp;</userinput>
 	<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
diff --git a/index.xml b/index.xml
index 97ddbeeff..430a56f57 100644
--- a/index.xml
+++ b/index.xml
@@ -10,8 +10,8 @@
 
 <!ENTITY ftp-root "ftp://packages.linuxfromscratch.org">
 <!ENTITY http-root "http://packages.linuxfromscratch.org">
-<!ENTITY ftp "ftp://packages.linuxfromscratch.org/intel-3.0-pre2">
-<!ENTITY http "http://packages.linuxfromscratch.org/intel-3.0-pre2">
+<!ENTITY ftp "ftp://packages.linuxfromscratch.org/cvs">
+<!ENTITY http "http://packages.linuxfromscratch.org/cvs">
 
 <!ENTITY part1 SYSTEM "intel/book/part1.xml">
 <!ENTITY part2 SYSTEM "intel/book/part2.xml">
@@ -82,6 +82,7 @@
 <!ENTITY c3-make SYSTEM "intel/chapter3/make.xml">
 <!ENTITY c3-sed SYSTEM "intel/chapter3/sed.xml">
 <!ENTITY c3-shellutils SYSTEM "intel/chapter3/shellutils.xml">
+<!ENTITY c3-shellutils-patch SYSTEM "intel/chapter3/shellutils-patch.xml">
 <!ENTITY c3-tar SYSTEM "intel/chapter3/tar.xml">
 <!ENTITY c3-tar-patch SYSTEM "intel/chapter3/tar-patch.xml">
 <!ENTITY c3-textutils SYSTEM "intel/chapter3/textutils.xml">
@@ -476,6 +477,7 @@
 <!ENTITY ac-make SYSTEM "intel/appendixc/make.xml">
 <!ENTITY ac-sed SYSTEM "intel/appendixc/sed.xml">
 <!ENTITY ac-shellutils SYSTEM "intel/appendixc/shellutils.xml">
+<!ENTITY ac-shellutils-patch SYSTEM "intel/appendixc/shellutils-patch.xml">
 <!ENTITY ac-tar SYSTEM "intel/appendixc/tar.xml">
 <!ENTITY ac-tar-patch SYSTEM "intel/appendixc/tar-patch.xml">
 <!ENTITY ac-textutils SYSTEM "intel/appendixc/textutils.xml">