| blob | abe96cb5f6676acae4c47aa173547c21152797f7 |
1 diff -Naur lfs-6.3/chapter03/packages.xml lfs-6.3forppc/chapter03/packages.xml
2 --- lfs-6.3/chapter03/packages.xml 2010-01-01 20:18:37.000000000 -0700
3 +++ lfs-6.3forppc/chapter03/packages.xml 2010-01-03 14:04:59.000000000 -0700
4 @@ -570,6 +570,15 @@
5 </varlistentry>
7 <varlistentry>
8 + <term>Yaboot (&yaboot-version;) - <token>&yaboot-size;</token>:</term>
9 + <listitem>
10 + <para>Home page: <ulink url="&yaboot-home;"/></para>
11 + <para>Download: <ulink url="&yaboot-url;"/></para>
12 + <para>MD5 sum: <literal>&yaboot-md5;</literal></para>
13 + </listitem>
14 + </varlistentry>
15 +
16 + <varlistentry>
17 <term>Zlib (&zlib-version;) - <token>&zlib-size;</token>:</term>
18 <listitem>
19 <para>Home page: <ulink url="&zlib-home;"/></para>
20 diff -Naur lfs-6.3/chapter05/adjusting.xml lfs-6.3forppc/chapter05/adjusting.xml
21 --- lfs-6.3/chapter05/adjusting.xml 2010-01-01 20:18:37.000000000 -0700
22 +++ lfs-6.3forppc/chapter05/adjusting.xml 2010-01-03 13:53:52.000000000 -0700
23 @@ -36,19 +36,19 @@
25 <para>For the sake of accuracy, it is recommended to use a copy-and-paste
26 method when issuing the following command. Be sure to visually inspect the
27 - specs file and verify that all occurrences of <quote>/lib/ld-linux.so.2</quote>
28 - have been replaced with <quote>/tools/lib/ld-linux.so.2</quote>:</para>
29 + specs file and verify that all occurrences of <quote>/lib/ld.so.1</quote>
30 + have been replaced with <quote>/tools/lib/ld.so.1</quote>:</para>
32 <important>
33 <para>If working on a platform where the name of the dynamic linker is
34 - something other than <filename class="libraryfile">ld-linux.so.2</filename>,
35 - replace <quote>ld-linux.so.2</quote> with the name of the platform's
36 + something other than <filename class="libraryfile">ld.so.1</filename>,
37 + replace <quote>ld.so.1</quote> with the name of the platform's
38 dynamic linker in the following commands. Refer to <xref
39 linkend="ch-tools-toolchaintechnotes" role=","/> if necessary.</para>
40 </important>
42 <!-- Ampersands are needed to allow copy and paste -->
43 -<screen><userinput>gcc -dumpspecs | sed 's@^/lib/ld-linux.so.2@/tools&@g' \
44 +<screen><userinput>gcc -dumpspecs | sed 's@/lib/ld.so.1@/tools&@g' \
45 > `dirname $(gcc -print-libgcc-file-name)`/specs</userinput></screen>
47 <para>During the build process, GCC runs a script
48 @@ -84,7 +84,7 @@
49 and the output of the last command will be of the form:</para>
51 <screen><computeroutput>[Requesting program interpreter:
52 - /tools/lib/ld-linux.so.2]</computeroutput></screen>
53 + /tools/lib/ld.so.1]</computeroutput></screen>
55 <para>Note that <filename class="directory">/tools/lib</filename>
56 appears as the prefix of the dynamic linker.</para>
57 diff -Naur lfs-6.3/chapter05/gcc-pass2.xml lfs-6.3forppc/chapter05/gcc-pass2.xml
58 --- lfs-6.3/chapter05/gcc-pass2.xml 2010-01-01 20:18:37.000000000 -0700
59 +++ lfs-6.3forppc/chapter05/gcc-pass2.xml 2010-01-03 13:53:52.000000000 -0700
60 @@ -86,7 +86,7 @@
62 <para>Apply the following patch to change the location of GCC's default
63 dynamic linker (typically <filename
64 - class="libraryfile">ld-linux.so.2</filename>):</para>
65 + class="libraryfile">ld.so.1</filename>):</para>
67 <screen><userinput>patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
69 diff -Naur lfs-6.3/chapter05/ncurses.xml lfs-6.3forppc/chapter05/ncurses.xml
70 --- lfs-6.3/chapter05/ncurses.xml 2010-01-01 20:18:37.000000000 -0700
71 +++ lfs-6.3forppc/chapter05/ncurses.xml 2010-01-03 13:53:52.000000000 -0700
72 @@ -40,7 +40,7 @@
73 <para>Prepare Ncurses for compilation:</para>
75 <screen><userinput>./configure --prefix=/tools --with-shared \
76 - --without-debug --without-ada --enable-overwrite</userinput></screen>
77 + --without-debug --without-ada --enable-overwrite --without-gpm</userinput></screen>
79 <variablelist>
80 <title>The meaning of the configure options:</title>
81 diff -Naur lfs-6.3/chapter06/chapter06.xml lfs-6.3forppc/chapter06/chapter06.xml
82 --- lfs-6.3/chapter06/chapter06.xml 2010-01-01 20:18:37.000000000 -0700
83 +++ lfs-6.3forppc/chapter06/chapter06.xml 2010-01-03 13:53:52.000000000 -0700
84 @@ -44,7 +44,6 @@
85 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="file.xml"/>
86 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="findutils.xml"/>
87 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="flex.xml"/>
88 - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grub.xml"/>
89 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gawk.xml"/>
90 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gettext.xml"/>
91 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grep.xml"/>
92 diff -Naur lfs-6.3/chapter06/coreutils.xml lfs-6.3forppc/chapter06/coreutils.xml
93 --- lfs-6.3/chapter06/coreutils.xml 2010-01-01 20:18:37.000000000 -0700
94 +++ lfs-6.3forppc/chapter06/coreutils.xml 2010-01-03 13:53:52.000000000 -0700
95 @@ -40,7 +40,7 @@
96 returns <computeroutput>unknown</computeroutput>. The following patch
97 fixes this behavior for Intel architectures:</para>
99 -<screen><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen>
100 +<screen><userinput># not on ppc patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen>
102 <para>Prevent Coreutils from installing binaries that will be installed by
103 other packages later:</para>
104 diff -Naur lfs-6.3/chapter06/glibc.xml lfs-6.3forppc/chapter06/glibc.xml
105 --- lfs-6.3/chapter06/glibc.xml 2010-01-01 20:18:37.000000000 -0700
106 +++ lfs-6.3forppc/chapter06/glibc.xml 2010-01-03 13:53:52.000000000 -0700
107 @@ -79,7 +79,7 @@
108 to check the Glibc we have just installed with the following:</para>
110 <screen><userinput>sed -i \
111 -'s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
112 +'s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld.so.1 -o|' \
113 scripts/test-installation.pl</userinput></screen>
115 <para>The <command>ldd</command> shell script contains Bash-specific
116 @@ -311,7 +311,7 @@
117 </indexterm>
119 <para>By default, the dynamic loader (<filename
120 - class="libraryfile">/lib/ld-linux.so.2</filename>) searches through
121 + class="libraryfile">/lib/ld.so.1</filename>) searches through
122 <filename class="directory">/lib</filename> and <filename
123 class="directory">/usr/lib</filename> for dynamic libraries that are
124 needed by programs as they are run. However, if there are libraries in
125 diff -Naur lfs-6.3/chapter06/inetutils.xml lfs-6.3forppc/chapter06/inetutils.xml
126 --- lfs-6.3/chapter06/inetutils.xml 2010-01-01 20:18:37.000000000 -0700
127 +++ lfs-6.3forppc/chapter06/inetutils.xml 2010-01-03 13:53:52.000000000 -0700
128 @@ -46,7 +46,7 @@
129 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
130 --sysconfdir=/etc --localstatedir=/var \
131 --disable-ifconfig --disable-logger --disable-syslogd \
132 - --disable-whois --disable-servers</userinput></screen>
133 + --disable-whois </userinput></screen>
135 <variablelist>
136 <title>The meaning of the configure options:</title>
137 diff -Naur lfs-6.3/chapter06/readjusting.xml lfs-6.3forppc/chapter06/readjusting.xml
138 --- lfs-6.3/chapter06/readjusting.xml 2010-01-01 20:18:37.000000000 -0700
139 +++ lfs-6.3forppc/chapter06/readjusting.xml 2010-01-03 13:53:52.000000000 -0700
140 @@ -39,14 +39,14 @@
142 <important>
143 <para>If working on a platform where the name of the dynamic linker is
144 - something other than <filename class="libraryfile">ld-linux.so.2</filename>,
145 - substitute <quote>ld-linux.so.2</quote> with the name of the platform's
146 + something other than <filename class="libraryfile">ld.so.1</filename>,
147 + substitute <quote>ld.so.1</quote> with the name of the platform's
148 dynamic linker in the following commands. Refer to <xref
149 linkend="ch-tools-toolchaintechnotes" role=","/> if necessary.</para>
150 </important>
152 <screen><userinput>gcc -dumpspecs | sed \
153 - -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' \
154 + -e 's@/tools/lib/ld.so.1@/lib/ld.so.1@g' \
155 -e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
156 -e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' > \
157 `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen>
158 @@ -66,7 +66,7 @@
159 and the output of the last command will be (allowing for
160 platform-specific differences in dynamic linker name):</para>
162 -<screen os="c"><computeroutput>[Requesting program interpreter: /lib/ld-linux.so.2]</computeroutput></screen>
163 +<screen os="c"><computeroutput>[Requesting program interpreter: /lib/ld.so.1]</computeroutput></screen>
165 <para>Note that <filename class="directory">/lib</filename> is now
166 the prefix of our dynamic linker.</para>
167 @@ -120,7 +120,7 @@
168 and the output of the last command will be (allowing for
169 platform-specific differences in dynamic linker name):</para>
171 -<screen os="s"><computeroutput>found ld-linux.so.2 at /lib/ld-linux.so.2</computeroutput></screen>
172 +<screen os="s"><computeroutput>found ld.so.1 at /lib/ld.so.1</computeroutput></screen>
174 <para os="t">If the output does not appear as shown above or is not received
175 at all, then something is seriously wrong. Investigate and retrace the
176 diff -Naur lfs-6.3/packages.ent lfs-6.3forppc/packages.ent
177 --- lfs-6.3/packages.ent 2010-01-01 20:18:37.000000000 -0700
178 +++ lfs-6.3forppc/packages.ent 2010-01-03 14:08:38.000000000 -0700
179 @@ -509,6 +509,14 @@
180 <!ENTITY util-linux-ch6-du "17.2 MB">
181 <!ENTITY util-linux-ch6-sbu "0.2 SBU">
183 +<!ENTITY yaboot-version "1.3.14">
184 +<!ENTITY yaboot-size "214 KB">
185 +<!ENTITY yaboot-url "http://yaboot.ozlabs.org/releases/yaboot-&yaboot-version;.tar.gz">
186 +<!ENTITY yaboot-md5 "9b1246c474eeb37f61081ad762563b35">
187 +<!ENTITY yaboot-home "http://yaboot.ozlabs.org/">
188 +<!ENTITY yaboot-ch6-du "1.0XX MB">
189 +<!ENTITY yaboot-ch6-sbu "0.1XX SBU">
190 +
191 <!ENTITY vim-version "7.1">
192 <!ENTITY vim-docdir "vim/vim71">
193 <!ENTITY vim-size "6,714 KB">