[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-776-gd2ecc65
git
git at cross-lfs.org
Sat Apr 19 22:07:15 PDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, systemd has been updated
via d2ecc6524df2d495124d24523c8bdcfa284a0070 (commit)
via 03679c83e618d1c719c6650b215e32f10247fc44 (commit)
from 54bd1fe1b95c5c35ff1deea38afeff5b46678184 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d2ecc6524df2d495124d24523c8bdcfa284a0070
Author: Chris Staub <chris at beaker67.com>
Date: Sun Apr 20 01:07:08 2014 -0400
Reorganized boot section
diff --git a/BOOK/boot/64/createfiles.xml b/BOOK/boot/64/createfiles.xml
index a381d40..0026ab3 100644
--- a/BOOK/boot/64/createfiles.xml
+++ b/BOOK/boot/64/createfiles.xml
@@ -12,23 +12,18 @@
<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>
-
-<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>
-
- <para os="b">To enable some c++ tests in the Glibc and Binutils testsuites
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/createfiles.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/createfiles.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
+
+ <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>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/boot/64/e2fsprogs.xml b/BOOK/boot/64/e2fsprogs.xml
index 1f3cdaf..c7cbb49 100644
--- a/BOOK/boot/64/e2fsprogs.xml
+++ b/BOOK/boot/64/e2fsprogs.xml
@@ -68,15 +68,6 @@
href="../common/e2fsprogs.xml"
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>
<sect2 role="content">
diff --git a/BOOK/boot/64/eudev.xml b/BOOK/boot/64/eudev.xml
index d1a3f48..9ba2035 100644
--- a/BOOK/boot/64/eudev.xml
+++ b/BOOK/boot/64/eudev.xml
@@ -29,7 +29,7 @@
KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
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>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/boot/64/grub-build.xml b/BOOK/boot/64/grub-build.xml
index f3e084c..75b6013 100644
--- a/BOOK/boot/64/grub-build.xml
+++ b/BOOK/boot/64/grub-build.xml
@@ -40,7 +40,7 @@
<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"
href="../x86/grub-build.xml"
diff --git a/BOOK/boot/alpha-chapter.xml b/BOOK/boot/alpha-chapter.xml
index 8a28aab..02a187d 100644
--- a/BOOK/boot/alpha-chapter.xml
+++ b/BOOK/boot/alpha-chapter.xml
@@ -12,22 +12,22 @@
<title>If You Are Going to Boot</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/kernel.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot-build.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
</chapter>
diff --git a/BOOK/boot/alpha/kernel.xml b/BOOK/boot/alpha/kernel.xml
index 77bc77f..a619697 100644
--- a/BOOK/boot/alpha/kernel.xml
+++ b/BOOK/boot/alpha/kernel.xml
@@ -79,14 +79,14 @@
xpointer="xpointer(//*[@os='s'])"/>
<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../bootable/x86/kernel.xml"
xpointer="xpointer(//*[@os='s2'])"/>
<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
@@ -96,7 +96,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='v'])"/>
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
diff --git a/BOOK/boot/common/changingowner.xml b/BOOK/boot/common/changingowner.xml
index bf4df5b..a61b390 100644
--- a/BOOK/boot/common/changingowner.xml
+++ b/BOOK/boot/common/changingowner.xml
@@ -10,14 +10,30 @@
<title>Changing Ownership</title>
- <para os="a">Currently, the <filename class="directory">${CLFS}</filename>
- directory and all of its subdirectories are owned by the user
- <systemitem class="username">clfs</systemitem>, a user that exists only
- on the host system. For security reasons, the ${CLFS} root directory and
- all of its subdirectories should be owned by
- <systemitem class="username">root</systemitem>. Change the ownership
- for ${CLFS} and its subdirectories by running this command:</para>
+ <para os="a">Currently, the <filename class="directory">/tools</filename>
+ and <filename class="directory">/cross-tools</filename> directories
+ are owned by the user <emphasis>clfs</emphasis>, a user that
+ exists only on the host system. Although <filename
+ class="directory">/tools</filename> and <filename
+ class="directory">/cross-tools</filename> can be deleted once the CLFS
+ system has been finished, they can be retained to build
+ additional CLFS systems. If the <filename class="directory">/tools</filename>
+ and <filename class="directory">/cross-tools</filename> directories are
+ kept as is, the files are owned by a user ID without a corresponding
+ account. This is dangerous because a user account created later could
+ get this same user ID and would own these directories and all the files
+ therein, thus exposing those files to possible malicious manipulation.</para>
-<screen os="b"><userinput>chown -Rv &uid-root;:&gid-root; ${CLFS}</userinput></screen>
+ <para os="b">One possible fix for this issue might be to add the
+ <systemitem class="username">clfs</systemitem> user to the new CLFS system
+ later when creating the <filename>/etc/passwd</filename> file, taking care
+ to assign it the same user and group IDs as on the host system. Alternatively,
+ assign the contents of the <filename class="directory">/tools</filename>
+ and <filename class="directory">/cross-tools</filename> directories to
+ user <systemitem class="username">root</systemitem> by running the
+ following commands:</para>
+
+<screen os="c"><userinput>chown -Rv 0:0 ${CLFS}/tools
+chown -Rv 0:0 ${CLFS}/cross-tools</userinput></screen>
</sect1>
diff --git a/BOOK/boot/common/createfiles.xml b/BOOK/boot/common/createfiles.xml
index 5fdc8f4..5b1d094 100644
--- a/BOOK/boot/common/createfiles.xml
+++ b/BOOK/boot/common/createfiles.xml
@@ -15,13 +15,17 @@
links which will be replaced by real files throughout the course of
the next chapter after the software has been installed.</para>
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
+<screen os="b"><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
+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>
+
<para os="c">Historically, Linux maintains a list of the mounted file systems
in the file <filename>/etc/mtab</filename>. Modern kernels maintain this list
diff --git a/BOOK/boot/common/creatingdirs.xml b/BOOK/boot/common/creatingdirs.xml
index a45f997..a0e024a 100644
--- a/BOOK/boot/common/creatingdirs.xml
+++ b/BOOK/boot/common/creatingdirs.xml
@@ -10,10 +10,18 @@
<title>Creating Directories</title>
- <para os="a">It is time to create some structure in the CLFS file system. Create a
+ <note os="a">
+ <para>The commands in the remainder of the book should be run as
+ the <systemitem class="username">root</systemitem> user. Check
+ that ${CLFS} is set in the
+ <systemitem class="username">root</systemitem> user’s environment
+ before proceeding.</para>
+ </note>
+
+ <para os="b">It is time to create some structure in the CLFS file system. Create a
standard directory tree by issuing the following commands:</para>
-<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib,mnt}
+<screen os="c"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib/firmware,mnt}
mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
mkdir -pv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}
@@ -24,13 +32,13 @@ mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}</userinput></screen>
- <para os="c">Directories are, by default, created with permission mode 755,
+ <para os="d">Directories are, by default, created with permission mode 755,
but this is not desirable for all directories. In the commands above,
two changes are made—one to the home directory of user
<systemitem class="username">root</systemitem>, and another to the
directories for temporary files.</para>
- <para os="d">The first mode change ensures that not just anybody can enter
+ <para os="e">The first mode change ensures that not just anybody can enter
the <filename class="directory">/root</filename> directory—the
same as a normal user would do with his or her home directory. The
second mode change makes sure that any user can write to the
@@ -40,7 +48,7 @@ mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}</userinput></scree
by the so-called <quote>sticky bit,</quote> the highest bit (1) in the
1777 bit mask.</para>
- <sect2 os="e">
+ <sect2 os="f">
<title>FHS Compliance Note</title>
<para>The directory tree is based on the Filesystem Hierarchy Standard
diff --git a/BOOK/boot/common/devices.xml b/BOOK/boot/common/devices.xml
index 55fea07..7ea8443 100644
--- a/BOOK/boot/common/devices.xml
+++ b/BOOK/boot/common/devices.xml
@@ -17,14 +17,6 @@
<sect2>
<title>Creating Initial Device Nodes</title>
- <note os="a">
- <para>The commands in the remainder of the book should be run as
- the <systemitem class="username">root</systemitem> user. Check
- that ${CLFS} is set in the
- <systemitem class="username">root</systemitem> user’s environment
- before proceeding.</para>
- </note>
-
<para os="b">When the kernel boots the system, it requires the presence
of a few device nodes, in particular the <filename
class="devicefile">console</filename> and <filename
diff --git a/BOOK/boot/common/e2fsprogs.xml b/BOOK/boot/common/e2fsprogs.xml
index dca7599..4d4bdd5 100644
--- a/BOOK/boot/common/e2fsprogs.xml
+++ b/BOOK/boot/common/e2fsprogs.xml
@@ -76,11 +76,6 @@
href="../../final-system/common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='l'])"/>
- <para os="ad">Create needed symlinks for a bootable system:</para>
-
-<screen os="ae"><userinput>ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin</userinput></screen>
-
-
</sect2>
<sect2 role="content">
diff --git a/BOOK/boot/common/eudev.xml b/BOOK/boot/common/eudev.xml
index 7ce7efa..132ffc7 100644
--- a/BOOK/boot/common/eudev.xml
+++ b/BOOK/boot/common/eudev.xml
@@ -45,7 +45,7 @@
<para os="i">Create a directory for storing firmware that can be
loaded by <command>udev</command>:</para>
-<screen os="k"><userinput>install -dv ${CLFS}/lib/firmware</userinput></screen>
+<screen os="k"><userinput>install -dv /tools/lib/firmware</userinput></screen>
<para os="r1">Create a dummy rule so that Eudev will name ethernet devices properly for the system.</para>
@@ -67,7 +67,7 @@
firmware.sh, fstab_import, path_id, scsi_id, udevadm, udevd, usb_id,
v4l_id, write_cd_rules, write_net_rules</seg>
<seg>libudev</seg>
- <seg>/etc/udev, /lib/firmware, /lib/udev, /usr/share/doc/udev</seg>
+ <seg>/tools/etc/udev, /tools/lib/firmware, /tools/lib/udev</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/boot/common/introduction.xml b/BOOK/boot/common/introduction.xml
index 4f176d9..05a1ec5 100644
--- a/BOOK/boot/common/introduction.xml
+++ b/BOOK/boot/common/introduction.xml
@@ -14,17 +14,4 @@
create a minimal system that will be used to boot the target machine and to
build the final system packages.</para>
- <para>There are a few additional packages that will need to be
- installed to allow you to boot the minimal system. They will be installed
- into <filename class="directory">/tools</filename>, but a few additional
- files and symlinks will be needed on the CLFS partition to be able to boot
- and log in. This will require the
- <systemitem class="username">clfs</systemitem> user to have write access to
- the rest of the CLFS partition, so you will need to temporarily change the
- ownership of ${CLFS} to the <systemitem class="username">clfs</systemitem> user.
- Run the following command as <systemitem
- class="username">root</systemitem>:</para>
-
-<screen><userinput>chown -v clfs ${CLFS}</userinput></screen>
-
</sect1>
diff --git a/BOOK/boot/common/kmod.xml b/BOOK/boot/common/kmod.xml
index 2f4ee8c..8c46470 100644
--- a/BOOK/boot/common/kmod.xml
+++ b/BOOK/boot/common/kmod.xml
@@ -22,6 +22,12 @@
<sect2 role="installation">
<title>Installation of Kmod</title>
+ <para os="s1">Tell Kmod to use <filename class="directory">/tools/lib/modules</filename>:</para>
+
+<screen os="s2"><userinput>cp -v libkmod/libkmod.c{,.orig}
+sed '/dirname_default_prefix /s@/lib/modules@/tools&@' \
+ libkmod/libkmod.c.orig > libkmod/libkmod.c</userinput></screen>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='a'])"/>
@@ -62,13 +68,10 @@ zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='i'])"/>
-<screen os="j"><userinput>ln -sv /tools/bin/kmod ${CLFS}/bin
-ln -sv kmod ${CLFS}/bin/lsmod
-ln -sv ../bin/kmod ${CLFS}/sbin/depmod
-ln -sv ../bin/kmod ${CLFS}/sbin/insmod
-ln -sv ../bin/kmod ${CLFS}/sbin/modprobe
-ln -sv ../bin/kmod ${CLFS}/sbin/modinfo
-ln -sv ../bin/kmod ${CLFS}/sbin/rmmod</userinput></screen>
+<screen os="j"><userinput>ln -sfv kmod /tools/bin/lsmod
+for tool in depmod insmod modprobe modinfo rmmod; do
+ ln -sv ../bin/kmod /tools/sbin/${tool}
+done</userinput></screen>
</sect2>
diff --git a/BOOK/boot/common/shadow.xml b/BOOK/boot/common/shadow.xml
index f07e2a2..73e4258 100644
--- a/BOOK/boot/common/shadow.xml
+++ b/BOOK/boot/common/shadow.xml
@@ -41,17 +41,18 @@ sed -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /' \
<screen os="g"><userinput>cp config.h{,.orig}
sed '/PASSWD_PROGRAM/s@/bin/passwd@/tools&@' config.h.orig > config.h</userinput></screen>
- <para os="h">Compile the package:</para>
+ <para os="h">Prevent Shadow from setting installed programs suid:</para>
-<screen os="i"><userinput>make</userinput></screen>
+<screen os="i"><userinput>cp -v src/Makefile{,.orig}
+sed 's/\(^suidu*bins = \).*/\1/' src/Makefile.orig > src/Makefile</userinput></screen>
- <para os="j">Install the package:</para>
+ <para os="j">Compile the package:</para>
-<screen os="k"><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make</userinput></screen>
- <para os="l">Create needed symlinks to be able to log on:</para>
+ <para os="l">Install the package:</para>
-<screen os="m"><userinput>ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
+<screen os="m"><userinput>make install</userinput></screen>
</sect2>
diff --git a/BOOK/boot/common/sysvinit.xml b/BOOK/boot/common/sysvinit.xml
index 7df5160..5ac89e8 100644
--- a/BOOK/boot/common/sysvinit.xml
+++ b/BOOK/boot/common/sysvinit.xml
@@ -38,8 +38,7 @@ make -C src CC="${CC}"</userinput></screen>
<para os="e">Install the package:</para>
-<screen os="ad"><userinput>make -C src ROOT=/tools install
-ln -svf /tools/sbin/init ${CLFS}/sbin</userinput></screen>
+<screen os="ad"><userinput>make -C src ROOT=/tools install</userinput></screen>
</sect2>
diff --git a/BOOK/boot/mips-chapter.xml b/BOOK/boot/mips-chapter.xml
index c8cb8a3..fc1e75f 100644
--- a/BOOK/boot/mips-chapter.xml
+++ b/BOOK/boot/mips-chapter.xml
@@ -12,21 +12,21 @@
<title>If You Are Going to Boot</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo-build.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingdirs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
diff --git a/BOOK/boot/mips/kernel.xml b/BOOK/boot/mips/kernel.xml
index e558658..ac8e60e 100644
--- a/BOOK/boot/mips/kernel.xml
+++ b/BOOK/boot/mips/kernel.xml
@@ -71,14 +71,14 @@
xpointer="xpointer(//*[@os='s'])"/>
<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../bootable/x86/kernel.xml"
xpointer="xpointer(//*[@os='s2'])"/>
<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
@@ -88,8 +88,8 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='v'])"/>
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
-gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/vmlinux-&linux-version;
+gzip -9 /tools/boot/vmlinux-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
diff --git a/BOOK/boot/mips64-64-chapter.xml b/BOOK/boot/mips64-64-chapter.xml
index 1d9cd43..630953e 100644
--- a/BOOK/boot/mips64-64-chapter.xml
+++ b/BOOK/boot/mips64-64-chapter.xml
@@ -12,22 +12,22 @@
<title>If You Are Going to Boot</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingdirs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
diff --git a/BOOK/boot/mips64-chapter.xml b/BOOK/boot/mips64-chapter.xml
index 8006df5..9438b8b 100644
--- a/BOOK/boot/mips64-chapter.xml
+++ b/BOOK/boot/mips64-chapter.xml
@@ -12,22 +12,22 @@
<title>If You Are Going to Boot</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/creatingdirs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
diff --git a/BOOK/boot/mips64/createfiles.xml b/BOOK/boot/mips64/createfiles.xml
index e818e5a..756c71c 100644
--- a/BOOK/boot/mips64/createfiles.xml
+++ b/BOOK/boot/mips64/createfiles.xml
@@ -22,9 +22,12 @@ ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
ln -sv /tools/lib32/libstdc++.so{.6,} ${CLFS}/usr/lib32
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"
href="../common/createfiles.xml"
diff --git a/BOOK/boot/mips64/kernel.xml b/BOOK/boot/mips64/kernel.xml
index c8b5923..68a3751 100644
--- a/BOOK/boot/mips64/kernel.xml
+++ b/BOOK/boot/mips64/kernel.xml
@@ -75,14 +75,14 @@
xpointer="xpointer(//*[@os='s'])"/>
<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../bootable/x86/kernel.xml"
xpointer="xpointer(//*[@os='s2'])"/>
<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
@@ -92,8 +92,8 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='v'])"/>
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
-gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/vmlinux-&linux-version;
+gzip -9 /tools/boot/vmlinux-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
diff --git a/BOOK/boot/multilib/createfiles.xml b/BOOK/boot/multilib/createfiles.xml
index 11af2db..07c8415 100644
--- a/BOOK/boot/multilib/createfiles.xml
+++ b/BOOK/boot/multilib/createfiles.xml
@@ -20,9 +20,12 @@ ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
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"
href="../common/createfiles.xml"
diff --git a/BOOK/boot/multilib/creatingdirs.xml b/BOOK/boot/multilib/creatingdirs.xml
index 44e16a6..115f75b 100644
--- a/BOOK/boot/multilib/creatingdirs.xml
+++ b/BOOK/boot/multilib/creatingdirs.xml
@@ -14,7 +14,11 @@
href="../common/creatingdirs.xml"
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}
mkdir -pv ${CLFS}/var/{opt,cache,lib{,64}/{misc,locate},local}
@@ -29,14 +33,14 @@ ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='c'])"/>
+ xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='f'])"/>
</sect1>
diff --git a/BOOK/boot/multilib/e2fsprogs.xml b/BOOK/boot/multilib/e2fsprogs.xml
index 1a3d997..a78e7c9 100644
--- a/BOOK/boot/multilib/e2fsprogs.xml
+++ b/BOOK/boot/multilib/e2fsprogs.xml
@@ -74,14 +74,6 @@ sed -e "/libdir=.*\/lib/s@/lib@/lib64 at g" configure.orig > configure</userinpu
href="../common/e2fsprogs.xml"
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>
<sect2 role="content">
diff --git a/BOOK/boot/multilib/kmod.xml b/BOOK/boot/multilib/kmod.xml
index a800039..4de7e1b 100644
--- a/BOOK/boot/multilib/kmod.xml
+++ b/BOOK/boot/multilib/kmod.xml
@@ -23,6 +23,14 @@
<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"
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='a'])"/>
@@ -53,7 +61,7 @@ CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/kmod.xml"
+ href="../common/kmod.xml"
xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/boot/ppc-chapter.xml b/BOOK/boot/ppc-chapter.xml
index 463b143..91a399a 100644
--- a/BOOK/boot/ppc-chapter.xml
+++ b/BOOK/boot/ppc-chapter.xml
@@ -12,22 +12,22 @@
<title>If You Are Going to Boot</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/kernel.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/powerpc-utils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot-build.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
diff --git a/BOOK/boot/ppc/kernel.xml b/BOOK/boot/ppc/kernel.xml
index b0eb33e..01f7e16 100644
--- a/BOOK/boot/ppc/kernel.xml
+++ b/BOOK/boot/ppc/kernel.xml
@@ -76,14 +76,14 @@
xpointer="xpointer(//*[@os='s'])"/>
<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../bootable/x86/kernel.xml"
xpointer="xpointer(//*[@os='s2'])"/>
<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
@@ -93,7 +93,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='v'])"/>
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
diff --git a/BOOK/boot/ppc64-64-chapter.xml b/BOOK/boot/ppc64-64-chapter.xml
index 0737bf4..7f36741 100644
--- a/BOOK/boot/ppc64-64-chapter.xml
+++ b/BOOK/boot/ppc64-64-chapter.xml
@@ -12,23 +12,23 @@
<title>If You Are Going to Boot</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/powerpc-utils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/yaboot-build.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
diff --git a/BOOK/boot/ppc64-chapter.xml b/BOOK/boot/ppc64-chapter.xml
index c4e9c8e..f6d2fa8 100644
--- a/BOOK/boot/ppc64-chapter.xml
+++ b/BOOK/boot/ppc64-chapter.xml
@@ -12,24 +12,24 @@
<title>If You Are Going to Boot</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs-libs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/powerpc-utils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot-build.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
diff --git a/BOOK/boot/ppc64/e2fsprogs.xml b/BOOK/boot/ppc64/e2fsprogs.xml
index 51068b1..f05597e 100644
--- a/BOOK/boot/ppc64/e2fsprogs.xml
+++ b/BOOK/boot/ppc64/e2fsprogs.xml
@@ -84,14 +84,6 @@ make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" LIBBLKID="-lblkid" \
href="../common/e2fsprogs.xml"
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>
<sect2 role="content">
diff --git a/BOOK/boot/ppc64/kernel.xml b/BOOK/boot/ppc64/kernel.xml
index 6e80670..aed4f7b 100644
--- a/BOOK/boot/ppc64/kernel.xml
+++ b/BOOK/boot/ppc64/kernel.xml
@@ -75,14 +75,14 @@
xpointer="xpointer(//*[@os='s'])"/>
<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../bootable/x86/kernel.xml"
xpointer="xpointer(//*[@os='s2'])"/>
<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
@@ -92,7 +92,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='v'])"/>
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
diff --git a/BOOK/boot/sparc-chapter.xml b/BOOK/boot/sparc-chapter.xml
index 1613915..789f069 100644
--- a/BOOK/boot/sparc-chapter.xml
+++ b/BOOK/boot/sparc-chapter.xml
@@ -12,21 +12,21 @@
<title>If You Are Going to Boot</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
diff --git a/BOOK/boot/sparc/kernel.xml b/BOOK/boot/sparc/kernel.xml
index d769ee3..4e0994b 100644
--- a/BOOK/boot/sparc/kernel.xml
+++ b/BOOK/boot/sparc/kernel.xml
@@ -71,14 +71,14 @@
xpointer="xpointer(//*[@os='s'])"/>
<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../bootable/x86/kernel.xml"
xpointer="xpointer(//*[@os='s2'])"/>
<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
@@ -88,7 +88,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='v'])"/>
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
diff --git a/BOOK/boot/sparc64-64-chapter.xml b/BOOK/boot/sparc64-64-chapter.xml
index 3f34e6d..f5ad67e 100644
--- a/BOOK/boot/sparc64-64-chapter.xml
+++ b/BOOK/boot/sparc64-64-chapter.xml
@@ -12,22 +12,22 @@
<title>If You Are Going to Boot</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
diff --git a/BOOK/boot/sparc64-chapter.xml b/BOOK/boot/sparc64-chapter.xml
index c74e5b0..d99ca76 100644
--- a/BOOK/boot/sparc64-chapter.xml
+++ b/BOOK/boot/sparc64-chapter.xml
@@ -12,22 +12,22 @@
<title>If You Are Going to Boot</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
diff --git a/BOOK/boot/sparc64/kernel.xml b/BOOK/boot/sparc64/kernel.xml
index 61f45e7..6eb019d 100644
--- a/BOOK/boot/sparc64/kernel.xml
+++ b/BOOK/boot/sparc64/kernel.xml
@@ -72,7 +72,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='s'])"/>
-<screen><userinput>make ARCH=sparc64 INSTALL_MOD_PATH=${CLFS} \
+<screen><userinput>make ARCH=sparc64 INSTALL_MOD_PATH=/tools \
CROSS_COMPILE=${CLFS_TARGET}- modules_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -80,7 +80,7 @@
xpointer="xpointer(//*[@os='s2'])"/>
<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
@@ -90,7 +90,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='v'])"/>
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
diff --git a/BOOK/boot/x86-chapter.xml b/BOOK/boot/x86-chapter.xml
index 1d3b33c..9cc65a6 100644
--- a/BOOK/boot/x86-chapter.xml
+++ b/BOOK/boot/x86-chapter.xml
@@ -12,20 +12,20 @@
<title>If You Are Going to Boot</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/kernel.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
diff --git a/BOOK/boot/x86/kernel.xml b/BOOK/boot/x86/kernel.xml
index 7bb21a9..987703f 100644
--- a/BOOK/boot/x86/kernel.xml
+++ b/BOOK/boot/x86/kernel.xml
@@ -79,36 +79,34 @@
xpointer="xpointer(//*[@os='s'])"/>
<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../bootable/x86/kernel.xml"
xpointer="xpointer(//*[@os='s2'])"/>
<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
<para os="u">After kernel compilation is complete, additional steps are
required to complete the installation. Some files need to be copied to
- the <filename class="directory">${CLFS}/boot</filename> directory.</para>
+ the <filename class="directory">/tools/boot</filename> directory.</para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../bootable/x86/kernel.xml"
- xpointer="xpointer(//*[@os='v'])"/>
+ <para os="v">Issue the following commands to install the kernel:</para>
-<screen><userinput>cp -v arch/i386/boot/bzImage ${CLFS}/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../bootable/x86/kernel.xml"
xpointer="xpointer(//*[@os='w'])"/>
-<screen os="w1"><userinput>cp -v System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
+<screen os="w1"><userinput>cp -v System.map /tools/boot/System.map-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../bootable/x86/kernel.xml"
xpointer="xpointer(//*[@os='x'])"/>
-<screen os="x1"><userinput>cp -v .config ${CLFS}/boot/config-&linux-version;</userinput></screen>
+<screen os="x1"><userinput>cp -v .config /tools/boot/config-&linux-version;</userinput></screen>
</sect2>
diff --git a/BOOK/boot/x86_64-64-chapter.xml b/BOOK/boot/x86_64-64-chapter.xml
index 2ba4d5a..978c4d8 100644
--- a/BOOK/boot/x86_64-64-chapter.xml
+++ b/BOOK/boot/x86_64-64-chapter.xml
@@ -12,21 +12,21 @@
<title>If You Are Going to Boot</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/grub-build.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
diff --git a/BOOK/boot/x86_64-64/kmod.xml b/BOOK/boot/x86_64-64/kmod.xml
index 86d78c9..6db782a 100644
--- a/BOOK/boot/x86_64-64/kmod.xml
+++ b/BOOK/boot/x86_64-64/kmod.xml
@@ -23,6 +23,14 @@
<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"
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='a'])"/>
@@ -52,7 +60,7 @@ CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/kmod.xml"
+ href="../common/kmod.xml"
xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/boot/x86_64-chapter.xml b/BOOK/boot/x86_64-chapter.xml
index cffec2e..844fda9 100644
--- a/BOOK/boot/x86_64-chapter.xml
+++ b/BOOK/boot/x86_64-chapter.xml
@@ -12,21 +12,21 @@
<title>If You Are Going to Boot</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grub-build.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/flags.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
diff --git a/BOOK/boot/x86_64/kernel.xml b/BOOK/boot/x86_64/kernel.xml
index 118f6f5..067c126 100644
--- a/BOOK/boot/x86_64/kernel.xml
+++ b/BOOK/boot/x86_64/kernel.xml
@@ -75,14 +75,14 @@
xpointer="xpointer(//*[@os='s'])"/>
<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../bootable/x86/kernel.xml"
xpointer="xpointer(//*[@os='s2'])"/>
<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
+ INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
@@ -92,7 +92,8 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='v'])"/>
-<screen><userinput>cp -v arch/x86_64/boot/bzImage ${CLFS}/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
+<screen><userinput>mkdir -pv /tools/boot
+cp -v arch/x86_64/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/kernel.xml"
diff --git a/BOOK/chroot/64/createfiles.xml b/BOOK/chroot/64/createfiles.xml
index 8f72ac3..f28a529 100644
--- a/BOOK/chroot/64/createfiles.xml
+++ b/BOOK/chroot/64/createfiles.xml
@@ -26,7 +26,7 @@ ln -sv /run /var/run</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../boot/64/createfiles.xml"
- xpointer="xpointer(//*[@os='b'])"/>
+ xpointer="xpointer(//*[@os='e'])"/>
<screen><userinput>mkdir -pv /usr/lib64
ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib64</userinput></screen>
diff --git a/BOOK/chroot/common/creatingdirs.xml b/BOOK/chroot/common/creatingdirs.xml
index a4c8010..d334e9d 100644
--- a/BOOK/chroot/common/creatingdirs.xml
+++ b/BOOK/chroot/common/creatingdirs.xml
@@ -12,9 +12,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../boot/common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='a'])"/>
+ xpointer="xpointer(//*[@os='b'])"/>
-<screen os="b"><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib,mnt}
+<screen os="c"><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib,mnt}
mkdir -pv /{proc,media/{floppy,cdrom},run/shm,sbin,srv,sys}
mkdir -pv /var/{lock,log,mail,spool}
mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
@@ -27,14 +27,14 @@ mkdir -pv /usr/{,local/}share/man/man{1..8}</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../boot/common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='c'])"/>
+ xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../boot/common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../boot/common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='f'])"/>
</sect1>
diff --git a/BOOK/chroot/common/kernfs.xml b/BOOK/chroot/common/kernfs.xml
index 7cbe8b8..aac8776 100644
--- a/BOOK/chroot/common/kernfs.xml
+++ b/BOOK/chroot/common/kernfs.xml
@@ -10,9 +10,13 @@
<title>Mounting Virtual Kernel File Systems</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../boot/common/devices.xml"
- xpointer="xpointer(//*[@os='a'])"/>
+ <note os="a">
+ <para>The commands in the remainder of the book should be run as
+ the <systemitem class="username">root</systemitem> user. Check
+ that ${CLFS} is set in the
+ <systemitem class="username">root</systemitem> user’s environment
+ before proceeding.</para>
+ </note>
<para>Various file systems exported by the kernel are used to communicate
to and from the kernel itself. These file systems are virtual in that no
diff --git a/BOOK/chroot/mips/creatingdirs.xml b/BOOK/chroot/mips/creatingdirs.xml
index f3d2b87..a8a930d 100644
--- a/BOOK/chroot/mips/creatingdirs.xml
+++ b/BOOK/chroot/mips/creatingdirs.xml
@@ -12,11 +12,11 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='a'])"/>
+ xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='b'])"/>
+ xpointer="xpointer(//*[@os='c'])"/>
<para os="m1">These entries are needed for the RaQ2 bootloader. Only use these
if you are utilizing the Colo bootloader:</para>
@@ -26,14 +26,14 @@ ln -svf . boot</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='c'])"/>
+ xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='f'])"/>
</sect1>
diff --git a/BOOK/chroot/mips64/creatingdirs.xml b/BOOK/chroot/mips64/creatingdirs.xml
index a3f956f..9386822 100644
--- a/BOOK/chroot/mips64/creatingdirs.xml
+++ b/BOOK/chroot/mips64/creatingdirs.xml
@@ -12,7 +12,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='a'])"/>
+ xpointer="xpointer(//*[@os='b'])"/>
<screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,32,64},mnt}
mkdir -pv /{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
@@ -38,14 +38,14 @@ ln -sv ../lib/locale /usr/lib64</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='c'])"/>
+ xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='f'])"/>
</sect1>
diff --git a/BOOK/chroot/multilib/creatingdirs.xml b/BOOK/chroot/multilib/creatingdirs.xml
index e1ffbf2..da992d4 100644
--- a/BOOK/chroot/multilib/creatingdirs.xml
+++ b/BOOK/chroot/multilib/creatingdirs.xml
@@ -12,7 +12,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='a'])"/>
+ xpointer="xpointer(//*[@os='b'])"/>
<screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
mkdir -pv /{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
@@ -29,14 +29,14 @@ ln -sv ../lib/locale /usr/lib64</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='c'])"/>
+ xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='f'])"/>
</sect1>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 3241ed2..0083ed7 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,17 @@
-->
<listitem>
+ <para>20 April 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Reorganized "boot" section to allow everything
+ to be installed into /tools, remove the need to chown ${CLFS} to the
+ clfs user, and generally make the chapter's instructions flow better.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>18 April 2014</para>
<itemizedlist>
<listitem>
commit 03679c83e618d1c719c6650b215e32f10247fc44
Author: Chris Staub <chris at beaker67.com>
Date: Sun Apr 20 01:06:34 2014 -0400
Updated date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index bb26d53..b9f10cc 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "04"> <!-- Use two digits -->
<!ENTITY month_name "April">
-<!ENTITY day "19"> <!-- Use two digits -->
+<!ENTITY day "20"> <!-- Use two digits -->
<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/64/createfiles.xml | 25 ++++++++++---------------
BOOK/boot/64/e2fsprogs.xml | 9 ---------
BOOK/boot/64/eudev.xml | 2 +-
BOOK/boot/64/grub-build.xml | 2 +-
BOOK/boot/alpha-chapter.xml | 18 +++++++++---------
BOOK/boot/alpha/kernel.xml | 6 +++---
BOOK/boot/common/changingowner.xml | 32 ++++++++++++++++++++++++--------
BOOK/boot/common/createfiles.xml | 10 +++++++---
BOOK/boot/common/creatingdirs.xml | 18 +++++++++++++-----
BOOK/boot/common/devices.xml | 8 --------
BOOK/boot/common/e2fsprogs.xml | 5 -----
BOOK/boot/common/eudev.xml | 4 ++--
BOOK/boot/common/introduction.xml | 13 -------------
BOOK/boot/common/kmod.xml | 17 ++++++++++-------
BOOK/boot/common/shadow.xml | 13 +++++++------
BOOK/boot/common/sysvinit.xml | 3 +--
BOOK/boot/mips-chapter.xml | 18 +++++++++---------
BOOK/boot/mips/kernel.xml | 8 ++++----
BOOK/boot/mips64-64-chapter.xml | 18 +++++++++---------
BOOK/boot/mips64-chapter.xml | 18 +++++++++---------
BOOK/boot/mips64/createfiles.xml | 7 +++++--
BOOK/boot/mips64/kernel.xml | 8 ++++----
BOOK/boot/multilib/createfiles.xml | 7 +++++--
BOOK/boot/multilib/creatingdirs.xml | 12 ++++++++----
BOOK/boot/multilib/e2fsprogs.xml | 8 --------
BOOK/boot/multilib/kmod.xml | 10 +++++++++-
BOOK/boot/ppc-chapter.xml | 16 ++++++++--------
BOOK/boot/ppc/kernel.xml | 6 +++---
BOOK/boot/ppc64-64-chapter.xml | 16 ++++++++--------
BOOK/boot/ppc64-chapter.xml | 16 ++++++++--------
BOOK/boot/ppc64/e2fsprogs.xml | 8 --------
BOOK/boot/ppc64/kernel.xml | 6 +++---
BOOK/boot/sparc-chapter.xml | 18 +++++++++---------
BOOK/boot/sparc/kernel.xml | 6 +++---
BOOK/boot/sparc64-64-chapter.xml | 18 +++++++++---------
BOOK/boot/sparc64-chapter.xml | 18 +++++++++---------
BOOK/boot/sparc64/kernel.xml | 6 +++---
BOOK/boot/x86-chapter.xml | 16 ++++++++--------
BOOK/boot/x86/kernel.xml | 16 +++++++---------
BOOK/boot/x86_64-64-chapter.xml | 16 ++++++++--------
BOOK/boot/x86_64-64/kmod.xml | 10 +++++++++-
BOOK/boot/x86_64-chapter.xml | 16 ++++++++--------
BOOK/boot/x86_64/kernel.xml | 7 ++++---
BOOK/chroot/64/createfiles.xml | 2 +-
BOOK/chroot/common/creatingdirs.xml | 10 +++++-----
BOOK/chroot/common/kernfs.xml | 10 +++++++---
BOOK/chroot/mips/creatingdirs.xml | 10 +++++-----
BOOK/chroot/mips64/creatingdirs.xml | 8 ++++----
BOOK/chroot/multilib/creatingdirs.xml | 8 ++++----
BOOK/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 11 +++++++++++
51 files changed, 295 insertions(+), 280 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list