r7617 - in trunk/BOOK: . introduction/welcome x/installing

dj at linuxfromscratch.org dj at linuxfromscratch.org
Wed Nov 26 13:16:36 PST 2008


Author: dj
Date: 2008-11-26 14:16:36 -0700 (Wed, 26 Nov 2008)
New Revision: 7617

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/x-setup.xml
   trunk/BOOK/x/installing/xorg7.xml
Log:
Moved /etc/X11 sysmlinks to x-setup page.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2008-11-26 20:46:22 UTC (rev 7616)
+++ trunk/BOOK/general.ent	2008-11-26 21:16:36 UTC (rev 7617)
@@ -3,7 +3,7 @@
 $Date$
 -->
 
-<!ENTITY day          "25">                   <!-- Always 2 digits -->
+<!ENTITY day          "26">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">
 <!ENTITY copyrightdate "2001-&year;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2008-11-26 20:46:22 UTC (rev 7616)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2008-11-26 21:16:36 UTC (rev 7617)
@@ -41,6 +41,18 @@
 
 -->
     <listitem>
+      <para>November 26th, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Moved /etc/X11 symlinks to x-setup page.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to evdev-2.0.7 and libpciaccess-0.10.5.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 25th, 2008</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/x/installing/x-setup.xml
===================================================================
--- trunk/BOOK/x/installing/x-setup.xml	2008-11-26 20:46:22 UTC (rev 7616)
+++ trunk/BOOK/x/installing/x-setup.xml	2008-11-26 21:16:36 UTC (rev 7617)
@@ -51,6 +51,20 @@
 
 <screen role="root"><userinput>ln -vsf <replaceable><$XORG_PREFIX></replaceable> /usr/X11R6</userinput></screen>
 
+    <para>Packages in Xorg store their configuration files in
+    <filename class="directory">$XORG_PREFIX/lib/X11</filename> by default.
+    This is strictly against FHS guidelines.  Correct the installation
+    <filename class="directory">/etc/X11</filename> and create symlinks
+    in the original location with the commands as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>for file in $XORG_PREFIX/{lib/X11/xinit,share/X11/{app-defaults,twm,xkb}}
+do
+     mv -v $file /etc/X11/ 2> /dev/null &&
+     ln -v -s /etc/X11/$(basename $file) $file
+done
+</userinput></screen>
+
   </sect2>
 
   <sect2 role="configuration" id='xconfig'>

Modified: trunk/BOOK/x/installing/xorg7.xml
===================================================================
--- trunk/BOOK/x/installing/xorg7.xml	2008-11-26 20:46:22 UTC (rev 7616)
+++ trunk/BOOK/x/installing/xorg7.xml	2008-11-26 21:16:36 UTC (rev 7617)
@@ -77,14 +77,7 @@
     packages.</para>
   </note>
 
-<!--
   <para>Additionally, because of the large number of repetitive commands,
-  you are encouraged to script the build.  For most sections, you can use
-  a script with commands similar to the following, to compile and install
-  all packages in a wget file list:</para>
--->
-
-  <para>Additionally, because of the large number of repetitive commands,
   you are encouraged to partially automate the build.  The commands below
   (or similar) can be entered at the command line to compile each group of
   packages (proto, utils, libs, apps, drivers).  The wiki links on each
@@ -175,28 +168,6 @@
     $XORG_PREFIX/share/man</filename> as
     a MANDATORY_MANPATH in <filename>/etc/man_db.conf</filename>.</para>
 
-    <para>Packages in Xorg store their configuration files in
-    <filename class="directory">$XORG_PREFIX/lib/X11</filename> by default.
-    This is strictly against FHS guidelines.  To simplify installation,
-    create the proper installation directories in
-    <filename class="directory">/etc/X11</filename> and create symlinks
-    in <filename class="directory">$XORG_PREFIX/lib/X11</filename> to
-    satisfy the installation.  Execute the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>
-install -v -m755 -d \
-    /etc/X11/{app-defaults,fs,twm,xdm,xinit,xkb,xsm} &&
-
-install -v -m755 -d $XORG_PREFIX/lib/X11 &&
-
-for link in \
-    /etc/X11/{app-defaults,fs,twm,xdm,xinit,xkb,xsm}
-do
-    ln -sv $link $XORG_PREFIX/lib/X11
-done
-</userinput></screen>
-
   </sect2>
 
 </sect1>




More information about the blfs-book mailing list