more book patches.

Zack Winkles winkie at linuxfromscratch.org
Thu May 15 13:48:46 PDT 2003


they're all attached. couple of outstanding issues that irk me when i'm
floating around. enjoy.
-------------- next part --------------
diff -Naur book.orig/chapter01/changelog.xml book/chapter01/changelog.xml
--- book.orig/chapter01/changelog.xml	2003-05-13 14:51:15.000000000 -0400
+++ book/chapter01/changelog.xml	2003-05-15 16:18:24.412043440 -0400
@@ -78,6 +78,10 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>May 15th, 2003 [winkie]: Chapter 05 - Installing Expect:
+Don't both passing anything more than --prefix=/stage1. None of it is
+needed.</para></listitem>
+
 <listitem><para>May 13th, 2003 [gerard]: Chapter 06: When we
 <userinput>exec /path/to/bash --login</userinput>, also run <userinput>set
 +h</userinput> to keep the hashing option turned off. Fixes bug
diff -Naur book.orig/chapter05/expect-inst.xml book/chapter05/expect-inst.xml
--- book.orig/chapter05/expect-inst.xml	2003-05-10 19:48:25.000000000 -0400
+++ book/chapter05/expect-inst.xml	2003-05-15 16:17:30.652216176 -0400
@@ -4,8 +4,7 @@
 <title>Installation of Expect</title>
 
 <para><screen><userinput>patch -Np1 -i ../expect-&expect-version;.patch
-./configure --prefix=/stage1 --with-tcl=/stage1/lib \
-    --with-x=no --disable-symbols --cache-file=/dev/null
+./configure --prefix=/stage1
 make
 make test
 make install</userinput></screen></para>
-------------- next part --------------
diff -Naur book.orig/chapter01/changelog.xml book/chapter01/changelog.xml
--- book.orig/chapter01/changelog.xml	2003-05-15 16:19:10.412050376 -0400
+++ book/chapter01/changelog.xml	2003-05-15 16:25:11.226198288 -0400
@@ -78,6 +78,10 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>May 15th, 2003 [winkie]: Chapter 05 & 06 -
+Installing Coreutils: Only test the non-root stuff in Chapter 05, but
+test everything in Chapter 06.</para></listitem>
+
 <listitem><para>May 15th, 2003 [winkie]: Chapter 05 - Installing Expect:
 Don't both passing anything more than --prefix=/stage1. None of it is
 needed.</para></listitem>
diff -Naur book.orig/chapter05/coreutils-inst.xml book/chapter05/coreutils-inst.xml
--- book.orig/chapter05/coreutils-inst.xml	2003-05-10 19:48:25.000000000 -0400
+++ book/chapter05/coreutils-inst.xml	2003-05-15 16:19:58.366760152 -0400
@@ -5,7 +5,7 @@
 
 <para><screen><userinput>./configure --prefix=/stage1
 make
-make check-root
+make RUN_EXPENSIVE_TESTS=yes check
 make install</userinput></screen></para>
 
 
diff -Naur book.orig/chapter06/coreutils-inst.xml book/chapter06/coreutils-inst.xml
--- book.orig/chapter06/coreutils-inst.xml	2003-05-13 03:38:46.000000000 -0400
+++ book/chapter06/coreutils-inst.xml	2003-05-15 16:20:25.091697344 -0400
@@ -23,7 +23,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
-<para><screen><userinput>make check-root</userinput></screen></para>
+<para><screen><userinput>make check-root
+make RUN_EXPENSIVE_TESTS=yes check</userinput></screen></para>
 
 <para>Install the package:</para>
 
-------------- next part --------------
diff -Naur book.orig/chapter01/changelog.xml book/chapter01/changelog.xml
--- book.orig/chapter01/changelog.xml	2003-05-15 16:28:34.494296840 -0400
+++ book/chapter01/changelog.xml	2003-05-15 16:28:20.729389424 -0400
@@ -78,6 +78,10 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>May 15th, 2003 [winkie]: Chapter 05 - Installing Patch:
+Pass CPPFLAGS=-D_GNU_SOURCE to the configure script so that a
+functioning patch binary is produced on non-x86 systems.</para></listitem>
+
 <listitem><para>May 15th, 2003 [winkie]: Chapter 05 & 06 -
 Installing Coreutils: Only test the non-root stuff in Chapter 05, but
 test everything in Chapter 06.</para></listitem>
diff -Naur book.orig/chapter05/patch-inst.xml book/chapter05/patch-inst.xml
--- book.orig/chapter05/patch-inst.xml	2003-05-10 19:48:25.000000000 -0400
+++ book/chapter05/patch-inst.xml	2003-05-15 16:27:29.716144616 -0400
@@ -3,10 +3,9 @@
 <sect2>
 <title>Installation of Patch</title>
 
-<para><screen><userinput>./configure --prefix=/stage1
+<para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/stage1
 make 
 make install</userinput></screen></para>
 
-
 </sect2>
 
-------------- next part --------------
diff -Naur book.orig/chapter01/changelog.xml book/chapter01/changelog.xml
--- book.orig/chapter01/changelog.xml	2003-05-15 16:29:04.247773624 -0400
+++ book/chapter01/changelog.xml	2003-05-15 16:34:46.951674712 -0400
@@ -78,6 +78,14 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>May 15th, 2003 [winkie]: Chapter 05 & 06 -
+Installing Glibc: Create an ld.so.conf file before building Glibc, to
+prevent an (harmless) error.</para></listitem>
+
+<listitem><para>May 15th, 2003 [winkie]: Chapter 06 - Installing Glibc:
+Don't both doing the 'exec /stage1/bin/bash' stuff, it doesn't do
+anything now that we use PLFS.</para></listitem>
+
 <listitem><para>May 15th, 2003 [winkie]: Chapter 05 - Installing Patch:
 Pass CPPFLAGS=-D_GNU_SOURCE to the configure script so that a
 functioning patch binary is produced on non-x86 systems.</para></listitem>
diff -Naur book.orig/chapter05/glibc-inst.xml book/chapter05/glibc-inst.xml
--- book.orig/chapter05/glibc-inst.xml	2003-05-13 03:38:45.000000000 -0400
+++ book/chapter05/glibc-inst.xml	2003-05-15 16:33:17.090335712 -0400
@@ -17,6 +17,13 @@
 <para>Basically, compiling Glibc in any other way than the book suggests
 is putting your system at a very high risk.</para>
 
+<para>Though it is a harmless message, the install stage of Glibc will
+complain about the presence of /etc/ld.so.conf (or lack thereof). Fix
+this annoying little error:</para>
+
+<para><screen><userinput>mkdir /stage1/etc
+touch /stage1/etc/ld.so.conf</userinput></screen></para>
+
 <para>The documentation that comes with Glibc recommends to build the package
 not in the source directory but in a separate, dedicated directory:</para>
 
diff -Naur book.orig/chapter06/glibc-inst.xml book/chapter06/glibc-inst.xml
--- book.orig/chapter06/glibc-inst.xml	2003-05-13 14:51:15.000000000 -0400
+++ book/chapter06/glibc-inst.xml	2003-05-15 16:33:39.406943072 -0400
@@ -3,6 +3,13 @@
 <sect2>
 <title>Glibc installation</title>
 
+<para>Though it is a harmless message, the install stage of Glibc will
+complain about the presence of /etc/ld.so.conf (or lack thereof). Fix
+this annoying little error:</para>
+
+<para><screen><userinput>mkdir /stage1/etc
+touch /stage1/etc/ld.so.conf</userinput></screen></para>
+
 <para>The documentation that comes with Glibc recommends to build the package
 not in the source directory but in a separate, dedicated directory:</para>
 
@@ -13,8 +20,7 @@
 
 <para><screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-add-ons \
-    --libexecdir=/usr/bin \
-    --with-headers=/usr/include</userinput></screen></para>
+    --libexecdir=/usr/bin --with-headers=/usr/include</userinput></screen></para>
 
 <para>The meaning of the configure options are:</para>
 
@@ -31,23 +37,6 @@
 <filename>/usr/bin</filename> directory.</para></listitem>
 </itemizedlist>
 
-<para>During this stage you will see the following warning:</para>
-
-<blockquote><screen>configure: warning:
-*** These auxiliary programs are missing or too old: msgfmt
-*** some features will be disabled.
-*** Check the INSTALL file for required versions.</screen></blockquote>
-
-<para>The missing <filename>msgfmt</filename> program (from the Gettext
-package, which we'll install later) won't cause any problems. The
-<filename>msgfmt</filename> is used to generate the binary translation
-files that can make your system talk in a different language. Because these
-translation files have already been generated for you, there is no need for
-<filename>msgfmt</filename>. You'd only need the program if you change the
-translation source files (the <filename>*.po</filename> files in the
-<filename class="directory">po</filename> subdirectory), which
-would require you to regenerate the binary files.</para>
-
 <para>Continue with compiling the package:</para>
 
 <para><screen><userinput>make</userinput></screen></para>
@@ -81,12 +70,5 @@
 
 <para><screen><userinput>make -C ../glibc-2.3.2/linuxthreads/man install</userinput></screen></para>
 
-<para>To finish off the installation we'll reload Bash so it will use the new
-<filename>libnss_*</filename> files. This will also get rid of the
-<emphasis>I have no name!</emphasis> message in the command prompt:</para>
-
-<para><screen><userinput>exec /stage1/bin/bash --login
-set +h</userinput></screen></para>
-
 </sect2>
 
-------------- next part --------------
diff -Naur book.orig/chapter01/changelog.xml book/chapter01/changelog.xml
--- book.orig/chapter01/changelog.xml	2003-05-15 16:41:45.875988536 -0400
+++ book/chapter01/changelog.xml	2003-05-15 16:41:32.391038560 -0400
@@ -78,6 +78,9 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>May 15th, 2003 [winkie]: Chapter 06 - Creating Files:
+All those ln commands can be made into a few long ln commands.</para></listitem>
+
 <listitem><para>May 15th, 2003 [winkie]: Chapter 05 & 06 -
 Installing Glibc: Create an ld.so.conf file before building Glibc, to
 prevent an (harmless) error.</para></listitem>
diff -Naur book.orig/chapter06/createfiles.xml book/chapter06/createfiles.xml
--- book.orig/chapter06/createfiles.xml	2003-05-12 19:19:36.000000000 -0400
+++ book/chapter06/createfiles.xml	2003-05-15 16:40:32.272178016 -0400
@@ -7,27 +7,12 @@
 will be replaced by real files throughout the course of this chapter when
 we're installing all the software.</para>
 
-<para><screen><userinput>ln -sf /stage1/bin/bash /bin
-ln -sf bash /bin/sh
-ln -sf /stage1/bin/pwd /bin
-ln -sf /stage1/bin/perl /usr/bin
-ln -sf /stage1/bin/cat /bin
-ln -sf /stage1/bin/stty /bin
-ln -sf /stage1/bin/msgfmt /usr/bin
-ln -sf /stage1/bin/xgettext /usr/bin
-ln -sf /stage1/bin/msgmerge /usr/bin
-ln -sf /stage1/bin/install /usr/bin
-ln -sf /usr/bin/install /bin
-ln -sf /stage1/bin/echo /bin
-ln -sf /stage1/bin/sed /bin
-ln -sf /stage1/bin/awk /bin
-ln -sf /stage1/bin/rm /bin
-ln -sf /stage1/bin/mv /bin
-ln -sf /stage1/bin/chmod /bin
-ln -sf /stage1/bin/chgrp /bin
-ln -sf /stage1/bin/sort /usr/bin
-ln -sf /stage1/bin/cmp /usr/bin</userinput></screen></para>
-
+<para><screen><userinput>ln -s /stage1/bin/{bash,pwd,cat,stty,echo,sed} /bin
+ln -s /stage1/bin/{rm,mv,chmod,chgrp} /bin
+ln -s /stage1/bin/{perl,msgfmt,xgettext,msgmerge,install} /usr/bin
+ln -s /stage1/bin/{sort,gawk,cmp} /usr/bin
+ln -s bash /bin/sh
+ln -s ../usr/bin/install /bin</userinput></screen></para>
 
 </sect1>
 


More information about the lfs-book mailing list