Changeset 6cefbfb for BOOK/temp-system/common

Timestamp:

Apr 16, 2011, 2:36:23 PM (15 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

21e442f

Parents:

8c3f58f (diff), af891d2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/introduction/common/changelog.xml
BOOK/packages.ent

Location:

BOOK/temp-system/common

Files:

• cloog-ppl.xml (modified) (1 diff)
• mpc.xml (modified) (1 diff)
• ppl.xml (modified) (1 diff)
• vim.xml (modified) (1 diff)

BOOK/temp-system/common/cloog-ppl.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of CLooG-PPL</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/cloog-ppl.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/cloog-ppl.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <para os="s1">The following prevents the configure script from setting <envar>LD_LIBRARY_PATH</envar> when it finds PPL. This will prevent any conflicts with libraries from the host system:</para>

BOOK/temp-system/common/mpc.xml

@@ -25 +25 @@
     <para os="a">Prepare MPC for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/tools \
+<screen os="b"><userinput>EGREP="grep -E" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 

BOOK/temp-system/common/ppl.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of PPL</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/ppl.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/ppl.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <para os="a">Prepare PPL for compilation:</para>

BOOK/temp-system/common/vim.xml

@@ -95 +95 @@
 <screen os="m"><userinput>ln -sv vim /tools/bin/vi</userinput></screen>
 
+    <para os="tv1" >Create a temporary vimrc to make it function more the way you may
+    expect it to. This is explained more in the final system:</para>
+
+<screen os="tv2"><userinput>cat &gt; /tools/etc/vimrc &lt;&lt; "EOF"
+<literal>" Begin /etc/vimrc
+
+set nocompatible
+set backspace=2
+set ruler
+syntax on
+
+" End /etc/vimrc</literal>
+EOF</userinput></screen>
+
   </sect2>