瀏覽代碼

Merge some minor stuff from LFS, remove unnecesary command from dbus command explanations and misc fixes.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10492 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Krejzi 11 年之前
父節點
當前提交
2925b3cb9d
共有 9 個文件被更改,包括 30 次插入34 次删除
  1. 2 2
      chapter05/gettext.xml
  2. 0 8
      chapter06/dbus.xml
  3. 2 1
      chapter06/gawk.xml
  4. 2 1
      chapter06/gcc.xml
  5. 6 8
      chapter06/kmod.xml
  6. 8 5
      chapter08/kernel.xml
  7. 2 2
      general.ent
  8. 7 6
      prologue/architecture.xml
  9. 1 1
      prologue/standards.xml

+ 2 - 2
chapter05/gettext.xml

@@ -80,13 +80,13 @@ make -C src msgfmt
 make -C src msgmerge
 make -C src xgettext</userinput></screen>
 
-    <para>As only three programs have been compiled, it is not possible to run the
+    <para>As only three prograsm have been compiled, it is not possible to run the
     test suite without compiling additional support libraries from the Gettext
     package. It is therefore not recommended to attempt to run the test suite at
     this stage.</para>
 
     <para>Install the <command>msgfmt</command>, <command>msgmerge</command> and
-     <command>xgettext</command> programs:</para>
+    <command>xgettext</command> programs:</para>
 
 <screen><userinput remap="install">cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
 

+ 0 - 8
chapter06/dbus.xml

@@ -57,14 +57,6 @@
     <variablelist>
       <title>The meaning of the configure options:</title>
 
-      <varlistentry>
-        <term><parameter>--enable-systemd</parameter></term>
-        <listitem>
-          <para>This enables support for authentication check using
-          Systemd Logind.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><parameter>--with-console-auth-dir=/run/console</parameter></term>
         <listitem>

+ 2 - 1
chapter06/gawk.xml

@@ -76,7 +76,8 @@ cp    -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</
         <seg>filefuncs.so, fnmatch.so, fork.so, inplace.so, ordchr.so,
         readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so,
         testext.so, and time.so</seg>
-        <seg>/usr/lib/gawk, /usr/libexec/awk, /usr/share/awk, /usr/share/doc/gawk-&gawk-version;</seg>
+        <seg>/usr/lib/gawk, /usr/libexec/awk, /usr/share/awk, 
+        /usr/share/doc/gawk-&gawk-version;</seg>
       </seglistitem>
     </segmentedlist>
 

+ 2 - 1
chapter06/gcc.xml

@@ -320,7 +320,8 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         libquadmath.{a,so}, libssp.{a,so},
         libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a and libtsan.{a,so}</seg>
 
-        <seg>/usr/include/c++, /usr/lib/gcc, /usr/libexec/gcc, /usr/share/gcc-&gcc-version;</seg>
+        <seg>/usr/include/c++, /usr/lib/gcc, /usr/libexec/gcc, 
+        /usr/share/gcc-&gcc-version;</seg>
       </seglistitem>
     </segmentedlist>
 

+ 6 - 8
chapter06/kmod.xml

@@ -88,21 +88,19 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>Install the package, create symlinks for compatibility with
-    Module-Init-Tools (the package that previously handled Linux kernel
-    modules), and manually install the man pages.  Also make sure that all
-    libraries are in the correct directory: </para>
+    <para>Install the package, man pages, and create symlinks for
+    compatibility with Module-Init-Tools (the package that previously handled
+    Linux kernel modules).  Also make sure that all libraries are in the
+    correct directory: </para>
 
 <screen><userinput remap="install">make install
+make -C man install
 
 for target in depmod insmod modinfo modprobe rmmod; do
   ln -sv ../bin/kmod /sbin/$target
 done
 
-ln -sv kmod /bin/lsmod
-
-cp -v man/*.5 /usr/share/man/man5
-cp -v man/*.8 /usr/share/man/man8</userinput></screen>
+ln -sv kmod /bin/lsmod</userinput></screen>
 
   </sect2>
 

+ 8 - 5
chapter08/kernel.xml

@@ -74,6 +74,7 @@
     work correctly or boot at all:</para>
 
     <screen role="nodump">General setup  ---&gt;
+  [*] open by fhandle syscalls
   [*] Control Group support
 Processor type and features  ---&gt;
   [*] Enable seccomp to safely compute untrusted bytecode
@@ -204,12 +205,14 @@ cp -r Documentation/* /usr/share/doc/linux-&linux-version;</userinput></screen>
     </warning>
 
     <warning>
-      <para>The headers in the system's
-      <filename class="directory">include</filename> directory should
+      <para>The headers in the system's <filename
+      class="directory">include</filename> directory (<filename
+      class="directory">/usr/include</filename>) should
       <emphasis>always</emphasis> be the ones against which Glibc was compiled,
-      that is, the sanitised headers from this Linux kernel tarball.
-      Therefore, they should <emphasis>never</emphasis> be replaced by either
-      the raw kernel headers or any other kernel sanitized headers.</para>
+      that is, the sanitised headers installed in <xref
+      linkend="ch-system-linux-headers"/>.  Therefore, they should
+      <emphasis>never</emphasis> be replaced by either the raw kernel headers
+      or any other kernel sanitized headers.</para>
     </warning>
 
   </sect2>

+ 2 - 2
general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version         "20140218-SYSTEMD">
-<!ENTITY releasedate     "February 18, 2014">
+<!ENTITY version         "20140226-systemd">
+<!ENTITY releasedate     "February 26, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.5">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

+ 7 - 6
prologue/architecture.xml

@@ -12,12 +12,13 @@
 
 <para>The primary target architectures of LFS are the AMD/Intel x86 (32-bit)
 and x86_64 (64-bit) CPUs.  On the other hand, the instructions in this book are
-also known to work, with some modifications, with the Power PC CPU. To build a
-system that utilizes one of these CPUs, the main prerequisite, in addition to
-those on the next few pages, is an existing Linux system such as an earlier LFS
-installation, Ubuntu, Red Hat/Fedora, SuSE, or other distribution that targets
-the architecture that you have. Also note that a 32-bit distribution can be
-installed and used as a host system on a 64-bit AMD/Intel computer.</para>
+also known to work, with some modifications, with the Power PC and ARM CPUs. To
+build a system that utilizes one of these CPUs, the main prerequisite, in
+addition to those on the next few pages, is an existing Linux system such as an
+earlier LFS installation, Ubuntu, Red Hat/Fedora, SuSE, or other distribution
+that targets the architecture that you have. Also note that a 32-bit
+distribution can be installed and used as a host system on a 64-bit AMD/Intel
+computer.</para>
 
 <para>Some other facts about 64-bit systems need to be added here. When
 compared to a 32-bit system, the sizes of executable programs are slightly

+ 1 - 1
prologue/standards.xml

@@ -112,7 +112,7 @@
       <varlistentry>
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
-          <para>At, Batch (a part of At), Cpio, Ed, Fcrontab, Initd-tools,
+          <para>At, Batch (a part of At), Cpio, Fcrontab, Initd-tools,
           Lsb_release, PAM, Sendmail (or Postfix or Exim) </para>
         </listitem>
       </varlistentry>