r3366 - in trunk/BOOK: introduction/welcome x/installing

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sun Jan 30 16:50:58 PST 2005


Author: randy
Date: 2005-01-30 17:50:56 -0700 (Sun, 30 Jan 2005)
New Revision: 3366

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/xfree86.xml
   trunk/BOOK/x/installing/xorg.xml
Log:
Modified sed command in Xorg and XFree86 instructions to only comment out virgin lines

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-01-30 23:01:56 UTC (rev 3365)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-01-31 00:50:56 UTC (rev 3366)
@@ -27,7 +27,9 @@
 Linux-PAM-linkage-2.patch.</para></listitem>
 
 <listitem><para>January 30th, 2005 [randy]: Separated root installation 
-commands from build commands in packages already indexed.</para></listitem>
+commands from build commands in packages already indexed; modified sed 
+in Xorg and XFree86 instructions to only comment out virgin 
+lines.</para></listitem>
 
 <listitem><para>January 29th, 2005 [randy]: Added vulnerability fix patch to 
 Bind instructions and bumped version entities to 9.3.0p1; added MD5 sum to

Modified: trunk/BOOK/x/installing/xfree86.xml
===================================================================
--- trunk/BOOK/x/installing/xfree86.xml	2005-01-30 23:01:56 UTC (rev 3365)
+++ trunk/BOOK/x/installing/xfree86.xml	2005-01-31 00:50:56 UTC (rev 3366)
@@ -329,7 +329,7 @@
 <para>Install <application>XFree86</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>sed -i -e "s@#include <linux/config.h>@/* & */@" \
+<screen><userinput><command>sed -i -e "s@^#include <linux/config.h>@/* & */@" \
     `grep -lr linux/config.h *` &&
 ( make WORLDOPTS="" World 2>&1 | \
     tee xfree-compile.log && exit $PIPESTATUS ) &&
@@ -346,7 +346,7 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><command>sed -i -e "s@#include <linux/config.h>@...</command>: The 
+<para><command>sed -i -e "s@^#include <linux/config.h>@...</command>: The 
 <application>Linux-Libc-Headers</application> package installed in 
 <acronym>LFS</acronym> installs a 
 <filename>/usr/include/linux/config.h</filename> file which is not compatible 

Modified: trunk/BOOK/x/installing/xorg.xml
===================================================================
--- trunk/BOOK/x/installing/xorg.xml	2005-01-30 23:01:56 UTC (rev 3365)
+++ trunk/BOOK/x/installing/xorg.xml	2005-01-31 00:50:56 UTC (rev 3366)
@@ -272,7 +272,7 @@
 <para>Install <application>Xorg</application> by running the following 
 commands:</para>
  
-<screen><userinput><command>sed -i -e "s@#include <linux/config.h>@/* & */@" \
+<screen><userinput><command>sed -i -e "s@^#include <linux/config.h>@/* & */@" \
     `grep -lr linux/config.h *` &&
 ( make World 2>&1 | tee xorg-compile.log && exit $PIPESTATUS ) &&
 make install &&
@@ -287,7 +287,7 @@
 <sect2>
 <title>Command explanations</title>
  
-<para><command>sed -i -e "s@#include <linux/config.h>@...</command>: The
+<para><command>sed -i -e "s@^#include <linux/config.h>@...</command>: The
 <application>Linux-Libc-Headers</application> package installed in
 <acronym>LFS</acronym> installs a
 <filename>/usr/include/linux/config.h</filename> file which is not compatible




More information about the blfs-book mailing list