Changeset 555d306

Timestamp:

Jun 1, 2014, 8:28:26 PM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

54ef248

Parents:

d5cb735

git-author:

Chris Staub <chris@…> (06/01/14 20:25:38)

git-committer:

Chris Staub <chris@…> (06/01/14 20:28:26)

Message:

More updates to choose page

Location:

BOOK/temp-system

Files:

• common/choose.xml (modified) (3 diffs)
• mips64/choose.xml (modified) (1 diff)
• multilib/choose.xml (modified) (1 diff)
• ppc64/choose.xml (modified) (1 diff)

BOOK/temp-system/common/choose.xml

@@ -11 +11 @@
   <title>To Boot or to Chroot?</title>
 
-  <para os="a"> There are two different ways you can proceed from this point
+  <para os="a">There are two different ways you can proceed from this point
   to build the final system. You can build a kernel, a bootloader, and
   a few other utilities, boot into the temporary system, and build the
@@ -35 +35 @@
   different architecture, such as building a PowerPC system from an x86. The
   rule of thumb here is that if the architectures match and you are running
-  the same series kernel 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>
+  the same series kernel (specifically, a 2.6.32 or newer Linux kernel) 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="d">If you are in any doubt about this, you can try the following
@@ -48 +48 @@
   boot method.</para>
 
-  <para os="g">To chroot, you will also need a Linux Kernel, version
-  2.6.32 or higher, having been compiled with GCC-4.1.2 or greater.
-  This is required because Glibc was built to generate libraries for the
-  smallest version of the Linux kernel expected to be supported.</para>
+  <para os="g">For the boot method, follow <xref linkend="chapter-boot"/>.</para>
 
-  <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="i">For the boot method, follow <xref linkend="chapter-boot"/>.</para>
-
-  <para os="j">For the chroot method, follow <xref linkend="chapter-chroot"/>.</para>
+  <para os="h">For the chroot method, follow <xref linkend="chapter-chroot"/>.</para>
 
 </sect1>

BOOK/temp-system/mips64/choose.xml

@@ -44 +44 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
 </sect1>

BOOK/temp-system/multilib/choose.xml

@@ -42 +42 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
 </sect1>

BOOK/temp-system/ppc64/choose.xml

@@ -40 +40 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
 </sect1>