Changeset 6757dcab for BOOK/final-system/multilib

Timestamp:

Mar 30, 2014, 8:40:00 PM (12 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

d560b4d

Parents:

31e77c0 (diff), ca8dde0 (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 'systemd' of git.cross-lfs.org:cross-lfs into systemd

Location:

BOOK/final-system/multilib

Files:

• bash.xml (modified) (2 diffs)
• readline-64bit.xml (modified) (2 diffs)
• readline-n32.xml (modified) (2 diffs)
• readline.xml (modified) (2 diffs)

BOOK/final-system/multilib/bash.xml

@@ -22 +22 @@
     <title>Installation of Bash</title>
 
-<!-- Bash branch update area
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/bash.xml"
@@ -30 +29 @@
     href="../common/bash.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
--->
 
     <para os="m1">The following sed points configure towards the correct

BOOK/final-system/multilib/readline-64bit.xml

@@ -22 +22 @@
     <title>Installation of Readline</title>
 
-<!-- Readline branch update area
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="readline.xml"
@@ -30 +29 @@
     href="readline.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
--->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/readline-n32.xml

@@ -23 +23 @@
     <title>Installation of Readline</title>
 
-<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="readline.xml"
@@ -31 +30 @@
     href="readline.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
--->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/readline.xml

@@ -23 +23 @@
     <title>Installation of Readline</title>
 
-<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/readline.xml"
@@ -31 +30 @@
     href="../common/readline.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
--->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"