Changeset d2ecc65 for BOOK/boot/multilib

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/multilib

Files:

• createfiles.xml (modified) (1 diff)
• creatingdirs.xml (modified) (3 diffs)
• e2fsprogs.xml (modified) (1 diff)
• kmod.xml (modified) (2 diffs)

BOOK/boot/multilib/createfiles.xml

@@ -21 +21 @@
 ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
 ln -sv /tools/lib64/libstdc++.so{.6,} ${CLFS}/usr/lib64
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la > ${CLFS}/usr/lib/libstdc++.la
+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>
+ln -sv ../run ${CLFS}/var/run
+ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin
+ln -sv /tools/sbin/init ${CLFS}/sbin
+ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/multilib/creatingdirs.xml

@@ -15 +15 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+<screen os="c"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
 mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
 mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
@@ -30 +34 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
@@ -40 +40 @@
   xpointer="xpointer(//*[@os='e'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
+
 </sect1>

BOOK/boot/multilib/e2fsprogs.xml

@@ -75 +75 @@
     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/multilib/kmod.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of Kmod</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -54 +62 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='i'])"/>