[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-2.1.0-1137-g150ed37
git
git at cross-lfs.org
Thu May 29 00:56:26 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, sysvinit has been updated
via 150ed3737d161236db768e7d97471af9b440b7e7 (commit)
via d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6 (commit)
via 5bef7dfe172c3291f071505cd77000abb672d6ef (commit)
via 6cb444fc742ff956c9c6dd8f29ecae5f94797f04 (commit)
via 9389c8283cfe3843f0a47b1a57d89a9e6afcf445 (commit)
via 704452b1b88fea0b41a48207d2baecd2dd4addca (commit)
via 10e11368f196f18b278019b1bb2897a23f3e2441 (commit)
from cf479f20d138f0d4e1f97a278e49fd74a9dd9ee0 (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 150ed3737d161236db768e7d97471af9b440b7e7
Merge: d3a81ee cf479f2
Author: Chris Staub <chris at beaker67.com>
Date: Thu May 29 03:56:24 2014 -0400
Merge branch 'sysvinit' of git.cross-lfs.org:cross-lfs into sysvinit
Conflicts:
BOOK/introduction/common/changelog.xml
diff --cc BOOK/introduction/common/changelog.xml
index de7918f,bcf6c72..874653e
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@@ -37,16 -37,18 +37,28 @@@
-->
<listitem>
+ <para>29 May 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Edited "how" page - removed details about
+ booting/chrooting and moved them to the "choose" page for temp-system.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>28 May 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Upgrade TZData to 2014d.</para>
+ </listitem>
+ <listitem>
+ <para>[William Harrington] - Upgrade Man-pages to 3.68.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>25 May 2014</para>
<itemizedlist>
<listitem>
commit d3a81ee2a903fb1e5c98f4f32eb31e1ab1f6d7b6
Author: Chris Staub <chris at beaker67.com>
Date: Thu May 29 03:48:56 2014 -0400
Replaced redirection operators with >
diff --git a/BOOK/boot/common/eudev.xml b/BOOK/boot/common/eudev.xml
index 6c12ebc..f572e58 100644
--- a/BOOK/boot/common/eudev.xml
+++ b/BOOK/boot/common/eudev.xml
@@ -48,7 +48,7 @@
<para os="r1">Create a dummy rule so that Eudev will name ethernet devices properly for the system.</para>
-<screen os="r2"><userinput>echo "# dummy, so that network is once again on eth*" > \
+<screen os="r2"><userinput>echo "# dummy, so that network is once again on eth*" > \
/tools/etc/udev/rules.d/80-net-name-slot.rules</userinput></screen>
</sect2>
diff --git a/BOOK/boot/common/shadow.xml b/BOOK/boot/common/shadow.xml
index 2add343..68c285a 100644
--- a/BOOK/boot/common/shadow.xml
+++ b/BOOK/boot/common/shadow.xml
@@ -28,7 +28,7 @@
<screen os="c"><userinput>cp -v src/Makefile.in{,.orig}
sed -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /' \
- src/Makefile.in.orig > src/Makefile.in</userinput></screen>
+ src/Makefile.in.orig > src/Makefile.in</userinput></screen>
<para os="d">Prepare Shadow for compilation:</para>
diff --git a/BOOK/boot/mips/colo-build.xml b/BOOK/boot/mips/colo-build.xml
index 93fd18b..e885f7a 100644
--- a/BOOK/boot/mips/colo-build.xml
+++ b/BOOK/boot/mips/colo-build.xml
@@ -39,7 +39,7 @@
xpointer="xpointer(//*[@os='s1'])"/>
<screen os="s2"><userinput>cp -v stage2/Makefile{,.orig}
-sed '/^CFLAGS/s/-Werror //' stage2/Makefile.orig > stage2/Makefile</userinput></screen>
+sed '/^CFLAGS/s/-Werror //' stage2/Makefile.orig > stage2/Makefile</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/mips/colo.xml"
diff --git a/BOOK/chroot/64/createfiles.xml b/BOOK/chroot/64/createfiles.xml
index b96fb12..df2aacf 100644
--- a/BOOK/chroot/64/createfiles.xml
+++ b/BOOK/chroot/64/createfiles.xml
@@ -20,7 +20,7 @@
ln -sv /tools/bin/file /usr/bin
ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
ln -sv bash /bin/sh
ln -sv /run /var/run</userinput></screen>
diff --git a/BOOK/chroot/common/createfiles.xml b/BOOK/chroot/common/createfiles.xml
index 9440a46..6ec0985 100644
--- a/BOOK/chroot/common/createfiles.xml
+++ b/BOOK/chroot/common/createfiles.xml
@@ -18,7 +18,7 @@
ln -sv /tools/bin/file /usr/bin
ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
ln -sv bash /bin/sh
ln -sv /run /var/run</userinput></screen>
diff --git a/BOOK/chroot/mips64/createfiles.xml b/BOOK/chroot/mips64/createfiles.xml
index 382149e..9cd89ff 100644
--- a/BOOK/chroot/mips64/createfiles.xml
+++ b/BOOK/chroot/mips64/createfiles.xml
@@ -22,7 +22,7 @@ ln -sv /tools/lib64/libgcc_s.so{,.1} /usr/lib64
ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
ln -sv /tools/lib32/libstdc++.so{.6,} /usr/lib32
ln -sv /tools/lib64/libstdc++.so{.6,} /usr/lib64
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
ln -sv bash /bin/sh
ln -sv /run /var/run</userinput></screen>
diff --git a/BOOK/cross-tools/common/gcc-static.xml b/BOOK/cross-tools/common/gcc-static.xml
index 1c74ac9..8b64009 100644
--- a/BOOK/cross-tools/common/gcc-static.xml
+++ b/BOOK/cross-tools/common/gcc-static.xml
@@ -50,8 +50,8 @@
<para os="ag">Change the StartFile Spec so that GCC looks in
<filename class="directory">/tools</filename>:</para>
-<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/linux.h
-echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/linux.h</userinput></screen>
+<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/linux.h
+echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/linux.h</userinput></screen>
<para os="t1">We will create a dummy <filename>limits.h</filename> so
the build will not use the one provided by the host distro:</para>
diff --git a/BOOK/cross-tools/ppc/gcc-static.xml b/BOOK/cross-tools/ppc/gcc-static.xml
index 6c305c0..de2f833 100644
--- a/BOOK/cross-tools/ppc/gcc-static.xml
+++ b/BOOK/cross-tools/ppc/gcc-static.xml
@@ -47,8 +47,8 @@
href="../common/gcc-static.xml"
xpointer="xpointer(//*[@os='ag'])"/>
-<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/rs6000/sysv4.h
-echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/rs6000/sysv4.h</userinput></screen>
+<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/rs6000/sysv4.h
+echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/rs6000/sysv4.h</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gcc-static.xml"
diff --git a/BOOK/final-system/common/coreutils.xml b/BOOK/final-system/common/coreutils.xml
index effc02c..f9388ea 100644
--- a/BOOK/final-system/common/coreutils.xml
+++ b/BOOK/final-system/common/coreutils.xml
@@ -67,7 +67,7 @@
and make the user <systemitem class="username">nobody</systemitem> a part
of it so that the tests are not skipped:</para>
-<screen os="j"><userinput remap="test">echo "dummy:x:1000:nobody" >> /etc/group</userinput></screen>
+<screen os="j"><userinput remap="test">echo "dummy:x:1000:nobody" >> /etc/group</userinput></screen>
<para os="k">Fix permissions of some files so the non-root user can compile
and run the tests:</para>
diff --git a/BOOK/final-system/common/ncurses.xml b/BOOK/final-system/common/ncurses.xml
index 6cb1f04..d062faf 100644
--- a/BOOK/final-system/common/ncurses.xml
+++ b/BOOK/final-system/common/ncurses.xml
@@ -67,7 +67,7 @@ rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so
can build properly:</para>
<screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
- echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
+ echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
done
ln -sfv libncursesw.so /usr/lib/libcursesw.so
diff --git a/BOOK/final-system/common/tar.xml b/BOOK/final-system/common/tar.xml
index 9745af9..cc5dd0c 100644
--- a/BOOK/final-system/common/tar.xml
+++ b/BOOK/final-system/common/tar.xml
@@ -48,7 +48,7 @@
<para os="h">Generate the man page and place it in the proper location:</para>
-<screen os="i"><userinput>perl tarman > /usr/share/man/man1/tar.1</userinput></screen>
+<screen os="i"><userinput>perl tarman > /usr/share/man/man1/tar.1</userinput></screen>
<para os="j">Install the documentation:</para>
diff --git a/BOOK/final-system/multilib/ncurses-64bit.xml b/BOOK/final-system/multilib/ncurses-64bit.xml
index 25e990f..8c67437 100644
--- a/BOOK/final-system/multilib/ncurses-64bit.xml
+++ b/BOOK/final-system/multilib/ncurses-64bit.xml
@@ -85,7 +85,7 @@ rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so
xpointer="xpointer(//*[@os='l'])"/>
<screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
- echo "INPUT(-l${lib}w)" > /usr/lib64/lib${lib}.so
+ echo "INPUT(-l${lib}w)" > /usr/lib64/lib${lib}.so
ln -sfv lib${lib}w.a /usr/lib64/lib${lib}.a
done
ln -sfv libcurses.so /usr/lib64/libcursesw.so
diff --git a/BOOK/final-system/multilib/ncurses-n32.xml b/BOOK/final-system/multilib/ncurses-n32.xml
index adaf121..fed74cd 100644
--- a/BOOK/final-system/multilib/ncurses-n32.xml
+++ b/BOOK/final-system/multilib/ncurses-n32.xml
@@ -85,7 +85,7 @@ rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so
xpointer="xpointer(//*[@os='l'])"/>
<screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
- echo "INPUT(-l${lib}w)" > /usr/lib32/lib${lib}.so
+ echo "INPUT(-l${lib}w)" > /usr/lib32/lib${lib}.so
ln -sfv lib${lib}w.a /usr/lib32/lib${lib}.a
done
ln -sfv libcurses.so /usr/lib32/libcursesw.so
diff --git a/BOOK/final-system/multilib/ncurses.xml b/BOOK/final-system/multilib/ncurses.xml
index b5720dd..2e83afa 100644
--- a/BOOK/final-system/multilib/ncurses.xml
+++ b/BOOK/final-system/multilib/ncurses.xml
@@ -86,7 +86,7 @@
xpointer="xpointer(//*[@os='l'])"/>
<screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
- echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
+ echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
done
ln -sfv libcurses.so /usr/lib/libcursesw.so
diff --git a/BOOK/final-system/multilib/perl-64bit.xml b/BOOK/final-system/multilib/perl-64bit.xml
index c633cce..2402e2c 100644
--- a/BOOK/final-system/multilib/perl-64bit.xml
+++ b/BOOK/final-system/multilib/perl-64bit.xml
@@ -46,7 +46,7 @@
<para os="m2">We still need to tell Perl to actually use <filename class="directory">lib64</filename>:</para>
-<screen os="m3"><userinput>echo 'installstyle="lib64/perl5"' >>hints/linux.sh</userinput></screen>
+<screen os="m3"><userinput>echo 'installstyle="lib64/perl5"' >> hints/linux.sh</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/perl.xml"
diff --git a/BOOK/final-system/multilib/perl-n32.xml b/BOOK/final-system/multilib/perl-n32.xml
index c7ddc98..605191c 100644
--- a/BOOK/final-system/multilib/perl-n32.xml
+++ b/BOOK/final-system/multilib/perl-n32.xml
@@ -47,7 +47,7 @@
<para os="m2">We still need to tell perl to actually use lib32:</para>
-<screen os="m3"><userinput>echo 'installstyle="lib32/perl5"' >>hints/linux.sh</userinput></screen>
+<screen os="m3"><userinput>echo 'installstyle="lib32/perl5"' >> hints/linux.sh</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/perl.xml"
diff --git a/BOOK/prologue/common/hostreqs.xml b/BOOK/prologue/common/hostreqs.xml
index 072d280..15f55ee 100644
--- a/BOOK/prologue/common/hostreqs.xml
+++ b/BOOK/prologue/common/hostreqs.xml
@@ -133,7 +133,7 @@ sed --version | head -n1
tar --version | head -n1
makeinfo --version | head -n1
xz --version | head -n1
-echo 'main(){}' | gcc -v -o /dev/null -x c - > dummy.log 2>&1
+echo 'main(){}' | gcc -v -o /dev/null -x c - > dummy.log 2>&1
if ! grep -q ' error' dummy.log; then
echo "Compilation successful" && rm dummy.log
else
diff --git a/BOOK/temp-system/common/bison.xml b/BOOK/temp-system/common/bison.xml
index 0871bf4..73d474e 100644
--- a/BOOK/temp-system/common/bison.xml
+++ b/BOOK/temp-system/common/bison.xml
@@ -25,7 +25,7 @@
<para os='s1'>Apply a <command>sed</command> which disables the building of <filename>bison.help</filename> when cross-compiling.</para>
<screen os='s2'><userinput>cp -v Makefile.in{,.orig}
-sed '/bison.help:/s/^/# /' Makefile.in.orig > Makefile.in</userinput></screen>
+sed '/bison.help:/s/^/# /' Makefile.in.orig > Makefile.in</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bison.xml"
diff --git a/BOOK/temp-system/common/gcc.xml b/BOOK/temp-system/common/gcc.xml
index 6e02cab..4eec0c1 100644
--- a/BOOK/temp-system/common/gcc.xml
+++ b/BOOK/temp-system/common/gcc.xml
@@ -96,7 +96,7 @@
<screen os="s2"><userinput>cp -v Makefile{,.orig}
sed "/^HOST_\(GMP\|ISL\|CLOOG\)\(LIBS\|INC\)/s:/tools:/cross-tools:g" \
- Makefile.orig > Makefile</userinput></screen>
+ Makefile.orig > Makefile</userinput></screen>
<para os="cm">Compile the package:</para>
diff --git a/BOOK/the-end/downloadclient.xml b/BOOK/the-end/downloadclient.xml
index 587d1eb..5ce9e7d 100644
--- a/BOOK/the-end/downloadclient.xml
+++ b/BOOK/the-end/downloadclient.xml
@@ -57,10 +57,10 @@ EOF</userinput></screen>
gawk 'BEGIN {
NetService = "/inet/tcp/0/mirror.anl.gov/80"
print "GET /pub/gnu/wget/wget-1.14.tar.xz" |& NetService
- while ((NetService |& getline) > 0)
+ while ((NetService |& getline) > 0)
print $0
close(NetService)
-}' > binary
+}' > binary
gawk '{q=p;p=$0}NR>1{print q}END{ORS = ""; print p}' binary > wget-1.14.tar.xz
commit 5bef7dfe172c3291f071505cd77000abb672d6ef
Author: Chris Staub <chris at beaker67.com>
Date: Thu May 29 03:48:25 2014 -0400
Actually use choose file for ppc64
diff --git a/BOOK/temp-system/ppc64-chapter.xml b/BOOK/temp-system/ppc64-chapter.xml
index 9426283..318818b 100644
--- a/BOOK/temp-system/ppc64-chapter.xml
+++ b/BOOK/temp-system/ppc64-chapter.xml
@@ -40,6 +40,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/choose.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/choose.xml"/>
</chapter>
commit 6cb444fc742ff956c9c6dd8f29ecae5f94797f04
Author: Chris Staub <chris at beaker67.com>
Date: Thu May 29 03:47:20 2014 -0400
Removed extra spaces
diff --git a/BOOK/final-system/common/zlib.xml b/BOOK/final-system/common/zlib.xml
index dfc1ccd..5f6adb1 100644
--- a/BOOK/final-system/common/zlib.xml
+++ b/BOOK/final-system/common/zlib.xml
@@ -38,7 +38,7 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
<para os="e">To test the results, issue:</para>
-<screen os="e2" ><userinput remap="test">make check</userinput></screen>
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/temp-system/common/vim.xml b/BOOK/temp-system/common/vim.xml
index 279ab4d..1d9bf82 100644
--- a/BOOK/temp-system/common/vim.xml
+++ b/BOOK/temp-system/common/vim.xml
@@ -123,7 +123,7 @@ EOF</userinput></screen>
<screen os="m"><userinput>ln -sv vim /tools/bin/vi</userinput></screen>
- <para os="tv1" >Create a temporary vimrc to make it function more the way you may
+ <para os="tv1">Create a temporary vimrc to make it function more the way you may
expect it to. This is explained more in the final system:</para>
<screen os="tv2"><userinput>cat > /tools/etc/vimrc << "EOF"
commit 9389c8283cfe3843f0a47b1a57d89a9e6afcf445
Author: Chris Staub <chris at beaker67.com>
Date: Thu May 29 03:40:16 2014 -0400
Moved details about booting/chrooting from how.xml to choose.xml
Conflicts:
BOOK/introduction/common/how.xml
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index b4ddd2d..de7918f 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>29 May 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Edited "how" page - removed details about
+ booting/chrooting and moved them to the "choose" page for temp-system.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>25 May 2014</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/introduction/common/how.xml b/BOOK/introduction/common/how.xml
index 774cebf..c24ab38 100644
--- a/BOOK/introduction/common/how.xml
+++ b/BOOK/introduction/common/how.xml
@@ -21,10 +21,9 @@
<para>As an alternative to installing an entire separate distribution onto
your machine, you may wish to use a livecd. Most distributions provide
a livecd, which provides an environment to which you can add the required
- tools onto, allowing you to
- successfully follow the instructions in this book. Remember that if you
- reboot the livecd you will need to reconfigure the host environment before
- continuing with your build.</para>
+ tools onto, allowing you to successfully follow the instructions in this
+ book. Remember that if you reboot the livecd you will need to reconfigure
+ the host environment before continuing with your build.</para>
<para><xref linkend="chapter-partitioning"/> of this book describes how
to create a new Linux native partition and file system, the place
@@ -53,34 +52,21 @@
<para>After we build our <quote>Cross-Tools</quote>, we start building
a very minimal working system in
- <filename class="directory">/tools</filename>. This minimal system will be
- built using the cross-toolchain in
- <filename class="directory">/cross-tools</filename>.</para>
+ <filename class="directory">/tools</filename>, using the cross-toolchain in
+ <filename class="directory">/cross-tools</filename>. Once the temporary
+ system is finished, we perform a few additional tasks to prepare to
+ enter this temporary build environment, either by booting or chrooting into
+ it. For more details about the difference between these methods, see
+ <xref linkend="ch-temp-system-choose"/>.</para>
- <para>In <xref linkend="chapter-building-system"/>, the full CLFS system is
- built. Depending on the system you are cross-compiling for, you will either
- boot the minimal temp-system on the target machine, or chroot into it.</para>
+ <para>In <xref linkend="chapter-building-system"/>, after having booted
+ or chrooted into the temporary build environment, the full CLFS system is
+ built.</para>
- <para>The <command>chroot</command> (change root) program is used to enter
- a virtual environment and start a new shell whose root directory will be set
- to the CLFS partition. This is very similar to rebooting and instructing the
- kernel to mount the CLFS partition as the root partition.
- The major advantage is that <quote>chrooting</quote> allows the builder to
- continue using the host while CLFS is being built. While waiting for package
- compilation to complete, a user can switch to a different virtual console
- (VC) or X desktop and continue using the computer as normal.</para>
-
- <para>Some systems cannot be built by chrooting so they must be
- booted instead. Generally, if you building for a different arch than
- the host system, you must reboot because the kernel will likely not
- support the target machine. Booting involves installing a few
- additional packages that are needed for bootup, installing
- bootscripts, and building a miminal kernel.<!-- We also describe some
- alternative booting methods in <xref linkend="ch-boot-whatnext"/> --></para>
-
- <para> To finish the installation, the CLFS-Bootscripts are set up in
- <xref linkend="chapter-system-config"/>, and the kernel and boot loader are set
- up in <xref linkend="chapter-bootable"/>. <xref linkend="chapter-finalizing"/>
+ <para>To finish the installation, several configuration files are created in
+ <xref linkend="chapter-system-config"/>, and the kernel and boot loader are
+ set up in <xref linkend="chapter-bootable"/>.
+ <xref linkend="chapter-finalizing"/>
contains information on furthering the CLFS experience beyond this book.
After the steps in this book have been implemented, the computer will be
ready to reboot into the new CLFS system.</para>
diff --git a/BOOK/temp-system/common/choose.xml b/BOOK/temp-system/common/choose.xml
index f18adab..7a40610 100644
--- a/BOOK/temp-system/common/choose.xml
+++ b/BOOK/temp-system/common/choose.xml
@@ -15,7 +15,23 @@
a few other utilities, boot into the temporary system, and build the
rest there. Alternatively, you can chroot into the temporary system.</para>
- <para os="b">The boot method is needed when you are building on a different
+ <para os="b">The <command>chroot</command> (change root) program is used to enter
+ a virtual environment and start a new shell whose root directory will be set
+ to the CLFS partition. This is very similar to rebooting and instructing the
+ kernel to mount the CLFS partition as the root partition.
+ The major advantage is that <quote>chrooting</quote> allows the builder to
+ continue using the host while CLFS is being built. While waiting for package
+ compilation to complete, a user can switch to a different virtual console
+ (VC) or X desktop and continue using the computer as normal.</para>
+
+ <para os="c">Some systems cannot be built by chrooting so they must be
+ booted instead. Generally, if you building for a different arch than
+ the host system, you must reboot because the kernel will likely not
+ support the target machine. Booting involves installing a few
+ additional packages that are needed for bootup, installing
+ boot-scripts, and building a miminal kernel.<!-- We also describe some
+ alternative booting methods in <xref linkend="ch-boot-whatnext"/> -->
+ The boot method is needed when you are building on a different
architecture. For example, if you are building a PowerPC system from
an x86, you can't chroot. The chroot method is for when you are
building on the same architecture. If you are building on, and for,
@@ -24,26 +40,26 @@
you can just chroot. If you aren't running the same series kernel, or are
wanting to run a different ABI, you will need to use the boot option.</para>
- <para os="c">If you are in any doubt about this, you can try the following
+ <para os="d">If you are in any doubt about this, you can try the following
commands to see if you can chroot:</para>
-<screen ><userinput>/tools/lib/libc.so.6
+<screen os="e"><userinput>/tools/lib/libc.so.6
/tools/bin/gcc -v</userinput></screen>
- <para>If either of these commands fail, you will have to follow the boot
+ <para os="f">If either of these commands fail, you will have to follow the boot
method.</para>
- <para>To chroot, you will also need a Linux Kernel-2.6.32 or greater
+ <para os="g">To chroot, you will also need a Linux Kernel-2.6.32 or greater
(having been compiled with GCC-4.1.2 or greater). The reason for the
kernel version requirement is that Glibc is built to generate the library
for the smallest version of the Linux kernel expected to be supported.</para>
- <para>To check your kernel version, run <command>cat /proc/version</command>
+ <para os="h">To check your kernel version, run <command>cat /proc/version</command>
- if it does not say that you are running a 2.6.32 or later Linux kernel,
compiled with GCC 4.1.2 or later, you cannot chroot.</para>
- <para os="e">For the boot method, follow <xref linkend="chapter-boot"/>.</para>
+ <para os="i">For the boot method, follow <xref linkend="chapter-boot"/>.</para>
- <para os="f">For the chroot method, follow <xref linkend="chapter-chroot"/>.</para>
+ <para os="j">For the chroot method, follow <xref linkend="chapter-chroot"/>.</para>
</sect1>
diff --git a/BOOK/temp-system/mips64/choose.xml b/BOOK/temp-system/mips64/choose.xml
index 7219ce2..a99336e 100644
--- a/BOOK/temp-system/mips64/choose.xml
+++ b/BOOK/temp-system/mips64/choose.xml
@@ -22,25 +22,33 @@
href="../common/choose.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen ><userinput>/tools/lib/libc.so.6
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/choose.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+<screen os="e"><userinput>/tools/lib/libc.so.6
/tools/lib32/libc.so.6
/tools/lib64/libc.so.6
/tools/bin/gcc -v</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../multilib/choose.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ xpointer="xpointer(//*[@os='f'])"/>
- <para>To chroot, you will also need a Linux Kernel-2.6.32 or greater (having been compiled with GCC-4.1.2 or greater). The reason for the kernel version requirement is that Glibc is built to generate the library for the smallest version of the Linux kernel expected to be supported.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/choose.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
- <para>To check your kernel version, run <command>cat /proc/version</command> - if it does not say that you are running a 2.6.32 or later Linux kernel, compiled with GCC 4.1.2 or later, you cannot chroot.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/choose.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/choose.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/choose.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ xpointer="xpointer(//*[@os='j'])"/>
</sect1>
diff --git a/BOOK/temp-system/multilib/choose.xml b/BOOK/temp-system/multilib/choose.xml
index 0360ff2..295c673 100644
--- a/BOOK/temp-system/multilib/choose.xml
+++ b/BOOK/temp-system/multilib/choose.xml
@@ -22,28 +22,31 @@
href="../common/choose.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen ><userinput>/tools/lib/libc.so.6
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/choose.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+<screen os="e"><userinput>/tools/lib/libc.so.6
/tools/lib64/libc.so.6
/tools/bin/gcc -v</userinput></screen>
- <para os="d">If any of these commands fail, you will have to follow the boot
+ <para os="f">If any of these commands fail, you will have to follow the boot
method.</para>
- <para>To chroot, you will also need a Linux Kernel-2.6.32 or greater
- (having been compiled with GCC-4.1.2 or greater). The reason for the
- kernel version requirement is that Glibc is built to generate the library
- for the smallest version of the Linux kernel expected to be supported.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/choose.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
- <para>To check your kernel version, run <command>cat /proc/version</command>
- - if it does not say that you are running a 2.6.32 or later Linux kernel,
- compiled with GCC 4.1.2 or later, you cannot chroot.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/choose.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/choose.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/choose.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ xpointer="xpointer(//*[@os='j'])"/>
</sect1>
diff --git a/BOOK/temp-system/ppc64/choose.xml b/BOOK/temp-system/ppc64/choose.xml
index 789f43b..f764fb0 100644
--- a/BOOK/temp-system/ppc64/choose.xml
+++ b/BOOK/temp-system/ppc64/choose.xml
@@ -18,6 +18,10 @@
href="../common/choose.xml"
xpointer="xpointer(//*[@os='b'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/choose.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
<para>Powerpc64 is slightly different from some of the other
architectures, because a 64-bit kernel running 32-bit userspace can
successfully chroot and execute 64-bit programs. However, if the
@@ -35,10 +39,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/choose.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/choose.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ xpointer="xpointer(//*[@os='j'])"/>
</sect1>
commit 704452b1b88fea0b41a48207d2baecd2dd4addca
Author: Chris Staub <chris at beaker67.com>
Date: Thu May 29 02:41:11 2014 -0400
No need for specific kernel version on host, unless you chroot
diff --git a/BOOK/prologue/common/hostreqs.xml b/BOOK/prologue/common/hostreqs.xml
index 00efc23..072d280 100644
--- a/BOOK/prologue/common/hostreqs.xml
+++ b/BOOK/prologue/common/hostreqs.xml
@@ -74,10 +74,6 @@
<para><emphasis role="strong">Gzip-1.2.4</emphasis></para>
</listitem>
- <listitem>
- <para><emphasis role="strong">Linux 2.6.32 (Built with GCC 4.1.2 or later)</emphasis></para>
- </listitem>
-
<listitem>
<para><emphasis role="strong">Make-3.80</emphasis></para>
</listitem>
@@ -130,7 +126,6 @@ g++ --version | head -n1
ldd $(which ${SHELL}) | grep libc.so | cut -d ' ' -f 3 | ${SHELL} | head -n 1 | cut -d ' ' -f 1-7
grep --version | head -n1
gzip --version | head -n1
-uname -s -r
make --version | head -n1
tic -V
patch --version | head -n1
commit 10e11368f196f18b278019b1bb2897a23f3e2441
Author: Chris Staub <chris at beaker67.com>
Date: Thu May 29 02:40:47 2014 -0400
Updated date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 7219a5b..f6678c7 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "05"> <!-- Use two digits -->
<!ENTITY month_name "May">
-<!ENTITY day "28"> <!-- Use two digits -->
+<!ENTITY day "29"> <!-- Use two digits -->
<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/common/eudev.xml | 2 +-
BOOK/boot/common/shadow.xml | 2 +-
BOOK/boot/mips/colo-build.xml | 2 +-
BOOK/chroot/64/createfiles.xml | 2 +-
BOOK/chroot/common/createfiles.xml | 2 +-
BOOK/chroot/mips64/createfiles.xml | 2 +-
BOOK/cross-tools/common/gcc-static.xml | 4 +-
BOOK/cross-tools/ppc/gcc-static.xml | 4 +-
BOOK/final-system/common/coreutils.xml | 2 +-
BOOK/final-system/common/ncurses.xml | 2 +-
BOOK/final-system/common/tar.xml | 2 +-
BOOK/final-system/common/zlib.xml | 2 +-
BOOK/final-system/multilib/ncurses-64bit.xml | 2 +-
BOOK/final-system/multilib/ncurses-n32.xml | 2 +-
BOOK/final-system/multilib/ncurses.xml | 2 +-
BOOK/final-system/multilib/perl-64bit.xml | 2 +-
BOOK/final-system/multilib/perl-n32.xml | 2 +-
BOOK/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 10 ++++++
BOOK/introduction/common/how.xml | 46 +++++++++-----------------
BOOK/prologue/common/hostreqs.xml | 7 +---
BOOK/temp-system/common/bison.xml | 2 +-
BOOK/temp-system/common/choose.xml | 32 +++++++++++++----
BOOK/temp-system/common/gcc.xml | 2 +-
BOOK/temp-system/common/vim.xml | 2 +-
BOOK/temp-system/mips64/choose.xml | 20 ++++++++---
BOOK/temp-system/multilib/choose.xml | 25 ++++++++------
BOOK/temp-system/ppc64-chapter.xml | 2 +-
BOOK/temp-system/ppc64/choose.xml | 8 +++-
BOOK/the-end/downloadclient.xml | 4 +-
30 files changed, 111 insertions(+), 89 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list