Changeset 03e6a40 for BOOK/boot/64/createfiles.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/boot/64/createfiles.xml (modified) (1 diff)

BOOK/boot/64/createfiles.xml

@@ -13 +13 @@
   <title>Creating Essential Symlinks</title>
 
-  <para os="a">Some programs use hard-wired paths to programs which do not exist
-  yet. In order to satisfy these programs, create a number of symbolic
-  links which will be replaced by real files throughout the course of
-  the next chapter after the software has been installed.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
-ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
-ln -sv bash ${CLFS}/bin/sh
-ln -sv ../run ${CLFS}/var/run</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-  <para os="b">To enable some c++ tests in the Glibc and Binutils testsuites
+  <para os="e">To enable some C++ tests in the Glibc and Binutils testsuites
   to link, create a directory and make some symbolic links:</para>
 
-<screen><userinput>mkdir -pv ${CLFS}/usr/lib64
-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib64</userinput></screen>
+<screen os="f"><userinput>mkdir -pv ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib64</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/createfiles.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>