Changeset bc2e3fa for BOOK/boot/common

Timestamp:

Dec 7, 2006, 11:23:24 PM (17 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

1e184e11

Parents:

8473983

Message:

Reverting of Sysroot Changes

Location:

BOOK/boot/common

Files:

• createfiles.xml (modified) (1 diff)
• e2fsprogs.xml (modified) (1 diff)
• module-init-tools.xml (modified) (1 diff)
• sysvinit.xml (modified) (2 diffs)

BOOK/boot/common/createfiles.xml

@@ -16 +16 @@
   the next chapter after the software has been installed.</para>
 
-<screen><userinput>cd ${CLFS}/bin
-ln -sf ../tools/bin/{bash,cat,grep,pwd,rm,stty} .
-ln -sf bash sh
-cd ${CLFS}/usr/lib
-ln -sv ../../tools/lib/libgcc_s.so{,.1} .
-ln -sv ../../tools/lib/libstd*so* .</userinput></screen>
+<screen><userinput>ln -sv /tools/bin/{bash,cat,grep,pwd,rm,stty} ${CLFS}/bin
+ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
+ln -sv /tools/lib/libstd* ${CLFS}/usr/lib
+ln -sv bash ${CLFS}/bin/sh</userinput></screen>
 
 </sect1>

BOOK/boot/common/e2fsprogs.xml

@@ -82 +82 @@
     xpointer="xpointer(//*[@os='k'])"/>
 
-<screen os="l"><userinput>make DESTDIR=${CLFS} install-libs</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
     <para os="ad">Create needed symlinks for a bootable system:</para>

BOOK/boot/common/module-init-tools.xml

@@ -42 +42 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="k"><userinput>make DESTDIR="${CLFS}" install</userinput></screen>
 
   </sect2>

BOOK/boot/common/sysvinit.xml

@@ -30 +30 @@
     -e "s@/dev/initctl@${CLFS}&@g" \
     -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3@g' \
-    -e "s@/usr/lib@${CLFS}/tools/lib@" \
+    -e "s@/usr/lib@/tools/lib@" \
     src/Makefile.orig > src/Makefile</userinput></screen>
 
@@ -44 +44 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="ad"><userinput>make -C src install INSTALL=install ROOT=${CLFS}</userinput></screen>
+<screen os="ad"><userinput>make -C src install INSTALL="install" ROOT="${CLFS}"</userinput></screen>
 
   </sect2>