Changeset 7d9f881

Timestamp:

04/05/2019 03:00:59 PM (4 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib-10.1

Children:

ee1a413

Parents:

8eb3fe4

Message:

Merge trunk, add multilib.xml to prologue

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11570 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• appendices/dependencies.xml (modified) (1 diff)
• chapter05/python.xml (modified) (1 diff)
• chapter06/glibc.xml (modified) (1 diff)
• chapter06/systemd.xml (modified) (1 diff)
• prologue/architecture.xml (modified) (1 diff)
• prologue/multilib.xml (added)
• prologue/preface.xml (modified) (1 diff)

appendices/dependencies.xml

@@ -226 +226 @@
         <seglistitem>
           <seg>Bash, Binutils, Bison, Coreutils, GCC, Glibc,
-          Grep, Make, and Readline</seg>
+          Grep, Make, Perl, and Readline</seg>
         </seglistitem>
       </segmentedlist>

chapter05/python.xml

@@ -63 +63 @@
         <term><parameter>--without-ensurepip</parameter></term>
         <listitem>
-          <para>This switch disables the Python installer, which is not needed
-          at this stage.</para>
+          <para>This switch disables the Python package installer, which is not
+          needed at this stage.</para>
         </listitem>
       </varlistentry>

chapter06/glibc.xml

@@ -126 +126 @@
           extra code to check for buffer overflows, such as stack
           smashing attacks.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--with-headers=/usr/include</parameter></term>
+        <listitem>
+          <para>This option tells the build system where to find the
+          kernel API headers. By default, those headers are sought in
+          <filename class="directory">/tools/include</filename>.</para>
         </listitem>
       </varlistentry>

chapter06/systemd.xml

@@ -189 +189 @@
 <screen><userinput remap="install">LANG=en_US.UTF-8 ninja install</userinput></screen>
 
-    <para>Remove an unnecessary directory:</para>
+    <para>Remove an unnecessary directory and file:</para>
 
 <screen><userinput remap="install">rm -rfv /usr/lib/rpm

prologue/architecture.xml

@@ -62 +62 @@
 -->
 
-<para arch="multilib">You are reading the
-<emphasis>LFS-&version;-multilib</emphasis> book. Building a multilib system
-requires compiling many applications three times: once for the primary
-64-bit architecture; once for the minor 32-bit architecture; and once again for
-the 32-bit architecture with 64-bit memory extensions.</para>
-
-<para arch="multilib">Multilib goes a bit beyond the basic educational approach
-of LFS which is to teach you how to build a Linux system. If you haven't
-previously built by the standard LFS book, you are encouraged to do so before
-attempting this edition.</para>
-
-<para arch="multilib">Continue only if you meet the following requirements:
-<itemizedlist>
-  <listitem><para>you have a x86_64 compatible machine</para></listitem>
-  <listitem><para>you already have experience with LFS</para></listitem>
-  <listitem><para>you have a need for 32-bit support</para></listitem>
-</itemizedlist>
-</para>
-
 </sect1>
 

prologue/preface.xml

@@ -15 +15 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audience.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="architecture.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="standards.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="why.xml"/>