浏览代码

Fix references to both 32-bit and 64-bit systems to list 64-bit examples first.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11377 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Bruce Dubbs 7 年之前
父节点
当前提交
e8b732abeb
共有 5 个文件被更改,包括 21 次插入11 次删除
  1. 11 0
      chapter01/changelog.xml
  2. 3 4
      chapter05/gcc-pass2.xml
  3. 3 3
      chapter05/glibc.xml
  4. 3 3
      general.ent
  5. 1 1
      packages.ent

+ 11 - 0
chapter01/changelog.xml

@@ -42,6 +42,17 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     appropriate for the entry or if needed the entire day's listitem.
 -->
 -->
+    <listitem>
+      <para>2018-02-26</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Fix references to both 32-bit and 
+           64-bit systems to list 64-bit examples first. Fixes
+          <ulink url="&lfs-ticket-root;4225">#4225</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
     <listitem>
     <listitem>
       <para>2018-02-14</para>
       <para>2018-02-14</para>
       <itemizedlist>
       <itemizedlist>

+ 3 - 4
chapter05/gcc-pass2.xml

@@ -197,11 +197,10 @@ readelf -l a.out | grep ': /tools'</userinput></screen>
     <para>If everything is working correctly, there should be no errors,
     <para>If everything is working correctly, there should be no errors,
     and the output of the last command will be of the form:</para>
     and the output of the last command will be of the form:</para>
 
 
-<screen><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux.so.2]</computeroutput></screen>
+<screen><computeroutput>[Requesting program interpreter: /tools/lib64/ld-linux.so.2]</computeroutput></screen>
 
 
-    <para>Note that <filename class="directory">/tools/lib</filename>, or
-    <filename class="directory">/tools/lib64</filename> for 64-bit machines
-    appears as the prefix of the dynamic linker.</para>
+    <para>Note that <filename class="directory">/tools/lib</filename> wiil
+    be the prefix of the dynamic linker for 32-bit machines.</para>
 
 
     <para>If the output is not shown as above or there was no output at all,
     <para>If the output is not shown as above or there was no output at all,
     then something is wrong. Investigate and retrace the steps to find out
     then something is wrong. Investigate and retrace the steps to find out

+ 3 - 3
chapter05/glibc.xml

@@ -159,10 +159,10 @@ readelf -l a.out | grep ': /tools'</userinput></screen>
     <para>If everything is working correctly, there should be no errors,
     <para>If everything is working correctly, there should be no errors,
     and the output of the last command will be of the form:</para>
     and the output of the last command will be of the form:</para>
 
 
-<screen><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux.so.2]</computeroutput></screen>
+<screen><computeroutput>[Requesting program interpreter: /tools/lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
 
 
-    <para>Note that for 64-bit machines, the interpreter name will be
-    <filename>/tools/lib64/ld-linux-x86-64.so.2</filename>.</para>
+    <para>Note that for 32-bit machines, the interpreter name will be
+    <filename>/tools/lib/ld-linux.so.2</filename>.</para>
 
 
     <para>If the output is not shown as above or there was no output at all,
     <para>If the output is not shown as above or there was no output at all,
     then something is wrong. Investigate and retrace the steps to find out
     then something is wrong. Investigate and retrace the steps to find out

+ 3 - 3
general.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180214">
+<!ENTITY version         "SVN-20180226">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
 
-<!ENTITY versiond        "20180214-systemd">
+<!ENTITY versiond        "20180226-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 <!ENTITY generic-versiond "systemd"> 
 
 
-<!ENTITY releasedate     "February 14, 2018">
+<!ENTITY releasedate     "February 26, 2018">
 
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.2">
 <!ENTITY milestone       "8.2">

+ 1 - 1
packages.ent

@@ -618,7 +618,7 @@
 <!ENTITY systemd-man-url  "http://anduin.linuxfromscratch.org/LFS/systemd-man-pages-&systemd-version;.tar.xz">
 <!ENTITY systemd-man-url  "http://anduin.linuxfromscratch.org/LFS/systemd-man-pages-&systemd-version;.tar.xz">
 <!ENTITY systemd-man-md5  "8b1b53cff433d99288ce17be775bc44c">
 <!ENTITY systemd-man-md5  "8b1b53cff433d99288ce17be775bc44c">
 <!ENTITY systemd-ch6-du   "297 MB">
 <!ENTITY systemd-ch6-du   "297 MB">
-<!ENTITY systemd-ch6-sbu  "0.2 SBU">
+<!ENTITY systemd-ch6-sbu  "1.1 SBU">
 
 
 <!ENTITY sysvinit-version "2.88dsf">
 <!ENTITY sysvinit-version "2.88dsf">
 <!ENTITY sysvinit-size "108 KB">
 <!ENTITY sysvinit-size "108 KB">