Changeset d2ecc65 for BOOK/boot/64

Timestamp:

Apr 19, 2014, 10:07:08 PM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

76ccba3

Parents:

03679c8

Message:

Reorganized boot section

Location:

BOOK/boot/64

Files:

• createfiles.xml (modified) (1 diff)
• e2fsprogs.xml (modified) (1 diff)
• eudev.xml (modified) (1 diff)
• grub-build.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,pwd,stty} ${CLFS}/bin
-ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
-ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la > ${CLFS}/usr/lib/libstdc++.la
-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
+<screen os="f"><userinput>mkdir -pv ${CLFS}/usr/lib64
 ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib64</userinput></screen>
 

BOOK/boot/64/e2fsprogs.xml

@@ -69 +69 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-
   </sect2>
 

BOOK/boot/64/eudev.xml

@@ -30 +30 @@
     CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
     --host=${CLFS_TARGET}  --disable-introspection --disable-gtk-doc-html \
-    --disable-gudev --disable-keymap --with-firmware-path=/lib/firmware \
+    --disable-gudev --disable-keymap --with-firmware-path=/tools/lib/firmware \
     --enable-libkmod</userinput></screen>
 

BOOK/boot/64/grub-build.xml

@@ -41 +41 @@
 <screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-werror --enable-grub-mkfont=no</userinput></screen>
+    --disable-werror --enable-grub-mkfont=no --with-bootdir=tools/boot</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"