Преглед на файлове

Sync with latest trunk updates.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10264 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess преди 12 години
родител
ревизия
aca25d4bc9
променени са 11 файла, в които са добавени 282 реда и са изтрити 64 реда
  1. 37 1
      appendices/dependencies.xml
  2. 34 0
      chapter01/changelog.xml
  3. 8 4
      chapter01/whatsnew.xml
  4. 9 0
      chapter03/packages.xml
  5. 3 3
      chapter05/stripping.xml
  6. 1 1
      chapter06/adjusting.xml
  7. 120 0
      chapter06/bc.xml
  8. 1 0
      chapter06/chapter06.xml
  9. 30 27
      general.ent
  10. 35 24
      packages.ent
  11. 4 4
      prologue/standards.xml

+ 37 - 1
appendices/dependencies.xml

@@ -181,6 +181,42 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Bc dependency info -->
+  <bridgehead renderas="sect2" id="bc-dep">Bc</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+          <seg>Bash, Binutils, Bison, Coreutils, GCC, Glibc,
+          Grep, Make, and Readline</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Gawk</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Linux Kernel</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&external;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Binutils dependency info -->
   <bridgehead renderas="sect2" id="binutils-dep">Binutils</bridgehead>
 
@@ -1268,7 +1304,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc, Grep,
+         <seg>Bash, Bc, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc, Grep,
          Gzip, Kmod, Make, Ncurses, Perl, and Sed</seg>
         </seglistitem>
       </segmentedlist>

+ 34 - 0
chapter01/changelog.xml

@@ -35,6 +35,40 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2013-05-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to IPRoute2-3.9.0. Fixes
+          <ulink url="&lfs-ticket-root;3339">#3339</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-05-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Upgrade to linux-3.9.0. Fixes
+          <ulink url="&lfs-ticket-root;3336">#3336</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Upgrade to zlib-1.2.8. Fixes
+          <ulink url="&lfs-ticket-root;3337">#3337</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+
+    <listitem>
+      <para>2013-04-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add bc to Chapter 6 to support Linux-3.9. Fixes
+          <ulink url="&lfs-ticket-root;3338">#3338</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>2013-04-28</para>

+ 8 - 4
chapter01/whatsnew.xml

@@ -109,9 +109,9 @@
     <!--<listitem>
       <para>Inetutils &inetutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>IPRoute2 &iproute2-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Kbd &kbd-version;</para>
     </listitem>-->
@@ -208,9 +208,9 @@
     <!--<listitem>
       <para>XZ-Utils &xz-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Zlib &zlib-version;</para>
-    </listitem>-->
+    </listitem>
   </itemizedlist>
 
   <!--<itemizedlist>
@@ -230,6 +230,10 @@
       <para>Attr-&attr-version;</para>
     </listitem>
 
+     <listitem>
+       <para>bc &bc-version;</para>
+     </listitem>
+
     <listitem>
       <para>&bash-fixes-patch;</para>
     </listitem>

+ 9 - 0
chapter03/packages.xml

@@ -50,6 +50,15 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Bc (&bc-version;) - <token>&bc-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&bc-home;"/></para>
+        <para>Download: <ulink url="&bc-url;"/></para>
+        <para>MD5 sum: <literal>&bc-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Binutils (&binutils-version;) - <token>&binutils-size;</token>:</term>
       <listitem>

+ 3 - 3
chapter05/stripping.xml

@@ -30,9 +30,9 @@ strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
 
 <screen><userinput>rm -rf /tools/{,share}/{info,man,doc}</userinput></screen>
 
-  <para>At this point, you should have at least 850 MB of free space in
-  <envar>$LFS</envar> that can be used to build and install Glibc in the
-  next phase. If you can build and install Glibc, you can build and install
+  <para>At this point, you should have at least 3 GB of free space in
+  <envar>$LFS</envar> that can be used to build and install Glibc and Gcc in
+  the next phase. If you can build and install Glibc, you can build and install
   the rest too.</para>
 
 </sect1>

+ 1 - 1
chapter06/adjusting.xml

@@ -81,7 +81,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
 <screen os="j"><userinput>grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'</userinput></screen>
 
   <para os="k">If everything is working correctly, there should be no errors,
-  and the output of the last command (allowing for platform-specific target triplets)
+  and the output of the last command
   will be:</para>
 
 <screen><computeroutput>SEARCH_DIR("/usr/lib")

+ 120 - 0
chapter06/bc.xml

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-bc" role="wrap">
+  <?dbhtml filename="bc.html"?>
+
+  <sect1info condition="script">
+    <productname>bc</productname>
+    <productnumber>&bc-version;</productnumber>
+    <address>&bc-url;</address>
+  </sect1info>
+
+  <title>Bc-&bc-version;</title>
+
+  <indexterm zone="ch-system-bc">
+    <primary sortas="a-Bc">Bc</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Bc package contains an arbitrary precision numeric processing 
+    language.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&bc-ch6-sbu;</seg>
+        <seg>&bc-ch6-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Bc</title>
+
+    <para>Prepare Bc for compilation:</para>
+
+<screen><userinput remap="configure">./configure --prefix=/usr --with-readline</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--with-readline</parameter></term>
+        <listitem>
+          <para>This option tells Bc to use the <filename
+          class="libraryfile">readline</filename> library that is already
+          installed on the system rather than using its own readline
+          version.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>To test bc, run the commands below. There is quite a bit of output,
+    so you may want to redirect it to a file. There are a very small percentage
+    of tests (10 of 12,144) that will indicate a roundoff error at the last
+    digit.</para>
+
+<screen><userinput remap="test">echo "quit" | ./bc/bc -l Test/checklib.b</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-bc" role="content">
+    <title>Contents of Bc</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>bc and dc</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="bc">
+        <term><command>bc</command></term>
+        <listitem>
+          <para>is a command line calculator</para>
+          <indexterm zone="ch-system-bc bc">
+            <primary sortas="b-bc">bc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dc">
+        <term><command>dc</command></term>
+        <listitem>
+          <para>is a reverse-polish command line calculator</para>
+          <indexterm zone="ch-system-bc dc">
+            <primary sortas="b-dc">dc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

+ 1 - 0
chapter06/chapter06.xml

@@ -46,6 +46,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="readline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>

+ 30 - 27
general.ent

@@ -1,35 +1,38 @@
-<!ENTITY version "SYSTEMD-20130428">
-<!ENTITY releasedate "April 28, 2013">
-<!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
-<!ENTITY milestone "7.4">
+<!ENTITY version         "SYSTEMD-20130504">
+<!ENTITY releasedate     "May 4, 2013">
+<!ENTITY copyrightdate   "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
+<!ENTITY milestone       "7.4">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
-<!ENTITY lfs-root "http://www.linuxfromscratch.org/">
+<!ENTITY lfs-root        "http://www.linuxfromscratch.org/">
+<!ENTITY blfs-root       "&lfs-root;blfs/">
+<!ENTITY faq-root        "&lfs-root;faq/">
+<!ENTITY hints-root      "&lfs-root;hints/downloads/files/">
+<!ENTITY hints-index     "&lfs-root;hints/list.html">
+<!ENTITY patches-root    "&lfs-root;patches/lfs/&generic-version;/">
+<!ENTITY downloads-root  "&lfs-root;lfs/downloads/&generic-version;/">
+<!ENTITY livecd-root     "&lfs-root;livecd/">
+<!ENTITY test-results    "&lfs-root;lfs/build-logs/&generic-version;/">
+<!ENTITY errata          "&lfs-root;lfs/errata/&generic-version;/">
+                         
 <!ENTITY lfs-ticket-root "http://wiki.linuxfromscratch.org/lfs/ticket/">
-<!ENTITY blfs-root "&lfs-root;blfs/">
-<!ENTITY faq-root "&lfs-root;faq/">
-<!ENTITY hints-root "&lfs-root;hints/downloads/files/">
-<!ENTITY hints-index "&lfs-root;hints/list.html">
-<!ENTITY patches-root "&lfs-root;patches/lfs/&generic-version;/">
-<!ENTITY downloads-root "&lfs-root;lfs/downloads/&generic-version;/">
-<!ENTITY anduin-sources "http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages/conglomeration/">
-<!ENTITY anduin-other "http://anduin.linuxfromscratch.org/sources/other/">
-<!ENTITY livecd-root "&lfs-root;livecd/">
-<!ENTITY test-results "&lfs-root;lfs/build-logs/&generic-version;/">
-<!ENTITY errata "&lfs-root;lfs/errata/&generic-version;/">
 
-<!ENTITY buildtime "Approximate build time">
-<!ENTITY diskspace "Required disk space">
-<!ENTITY dependencies "Installation depends on">
-<!ENTITY testsuites "Test suite depends on">
-<!ENTITY before "Must be installed before">
-<!ENTITY external "Optional dependencies">
+<!ENTITY anduin          "http://anduin.linuxfromscratch.org/sources">
+<!ENTITY anduin-sources  "&anduin;/LFS/lfs-packages/conglomeration/">
+<!ENTITY anduin-other    "&anduin;/other/">
 
-<!ENTITY gnu "http://ftp.gnu.org/gnu/">
-<!ENTITY gnu-software "http://www.gnu.org/software/">
-<!ENTITY alpha-gnu "ftp://alpha.gnu.org/gnu/">
-<!ENTITY kernel "http://www.kernel.org/pub/">
-<!ENTITY sourceforge "http://prdownloads.sourceforge.net/">
+<!ENTITY buildtime       "Approximate build time">
+<!ENTITY diskspace       "Required disk space">
+<!ENTITY dependencies    "Installation depends on">
+<!ENTITY testsuites      "Test suite depends on">
+<!ENTITY before          "Must be installed before">
+<!ENTITY external        "Optional dependencies">
+                         
+<!ENTITY gnu             "http://ftp.gnu.org/gnu/">
+<!ENTITY gnu-software    "http://www.gnu.org/software/">
+<!ENTITY alpha-gnu       "http://alpha.gnu.org/gnu/">
+<!ENTITY kernel          "http://www.kernel.org/pub/">
+<!ENTITY sourceforge     "http://prdownloads.sourceforge.net/">
 
 <!ENTITY % packages-entities SYSTEM "packages.ent">
 %packages-entities;

+ 35 - 24
packages.ent

@@ -42,6 +42,14 @@
 <!ENTITY bash-ch6-du "45 MB">
 <!ENTITY bash-ch6-sbu "1.7 SBU">
 
+<!ENTITY bc-version "1.06.95">
+<!ENTITY bc-size "288 KB">
+<!ENTITY bc-url "&alpha-gnu;bc/bc-&bc-version;.tar.bz2">
+<!ENTITY bc-md5 "5126a721b73f97d715bb72c13c889035 ">
+<!ENTITY bc-home "&gnu-software;bc/">
+<!ENTITY bc-ch6-du "3 MB">
+<!ENTITY bc-ch6-sbu "0.1 SBU">
+
 <!ENTITY binutils-version "2.23.2">
 <!ENTITY binutils-size "20,938 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
@@ -199,8 +207,8 @@
 <!ENTITY gcc-ch5p1-sbu "5.5 SBU">
 <!ENTITY gcc-ch5p2-du "1.8 GB">
 <!ENTITY gcc-ch5p2-sbu "7.1 SBU">
-<!ENTITY gcc-ch6-du "2.0 GB">
-<!ENTITY gcc-ch6-sbu "53.5 SBU">
+<!ENTITY gcc-ch6-du "2.2 GB">
+<!ENTITY gcc-ch6-sbu "55.6 SBU">
 
 <!ENTITY gdbm-version "1.10">
 <!ENTITY gdbm-size "640 KB">
@@ -310,10 +318,10 @@
 <!ENTITY intltool-ch6-du "1.4 MB">
 <!ENTITY intltool-ch6-sbu "0.1 SBU">
 
-<!ENTITY iproute2-version "3.8.0">
-<!ENTITY iproute2-size "398 KB">
+<!ENTITY iproute2-version "3.9.0">
+<!ENTITY iproute2-size "403 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "951622fd770428116dc165acba375414">
+<!ENTITY iproute2-md5 "fd9db28e4f411a1e74de65c919ae590f">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "7.3 MB">
 <!ENTITY iproute2-ch6-sbu "0.1 SBU">
@@ -370,20 +378,23 @@
 <!ENTITY libtool-ch6-sbu "3.0 SBU">
 
 <!ENTITY linux-major-version "3">
-<!ENTITY linux-minor-version "8">
-<!ENTITY linux-patch-version "10">
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!-- <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
-<!ENTITY linux-size "69,330 KB">
+<!ENTITY linux-minor-version "9">
+<!ENTITY linux-patch-version "0">
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
+<!ENTITY linux-size "70,414 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "3d5fb6d9add9cce7725bbe9b139c8d6e">
-<!ENTITY linux-home "http://www.dfaad4ced830akernel.org/">
-<!ENTITY linux-ch8-du "540 - 800 MB">
-<!ENTITY linux-ch8-sbu "1.0 - 5.0 SBU">
-
-<!ENTITY linux-headers-ch5-du "511 MB">
+<!ENTITY linux-md5 "4348c9b6b2eb3144d601e87c19d5d909">
+<!ENTITY linux-home "http://www.kernel.org/">
+<!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
+ allnoconfig extended for a hopefully-bootable build on desktop machine,
+ max is allyesconfig which requires openssl -->
+<!ENTITY linux-ch8-du "700 - 6800 MB (typically about 800-900 MB)">
+<!ENTITY linux-ch8-sbu "3.0 - 49.0 SBU (typically about 6 SBU)">
+
+<!ENTITY linux-headers-ch5-du "580 MB">
 <!ENTITY linux-headers-ch5-sbu "0.1 SBU">
-<!ENTITY linux-headers-ch6-du "515 MB">
+<!ENTITY linux-headers-ch6-du "580 MB">
 <!ENTITY linux-headers-ch6-sbu "0.1 SBU">
 
 <!ENTITY m4-version "1.4.16">
@@ -444,7 +455,7 @@
 
 <!ENTITY ncurses-version "5.9">
 <!ENTITY ncurses-size "2,760 KB">
-<!ENTITY ncurses-url "ftp://ftp.gnu.org/gnu/ncurses/ncurses-&ncurses-version;.tar.gz">
+<!ENTITY ncurses-url "http://ftp.gnu.org/gnu/ncurses/ncurses-&ncurses-version;.tar.gz">
 <!ENTITY ncurses-md5 "8cb9c412e5f2d96bc6f459aa8c6282a1">
 <!ENTITY ncurses-home "http://www.gnu.org/software/ncurses/">
 <!ENTITY ncurses-ch5-du "35 MB">
@@ -608,11 +619,11 @@
 <!ENTITY xz-ch6-du "18 MB">
 <!ENTITY xz-ch6-sbu "0.3 SBU">
 
-<!ENTITY zlib-version "1.2.7">
-<!ENTITY zlib-size "493 KB">
-<!ENTITY zlib-url "http://www.zlib.net/zlib-&zlib-version;.tar.bz2">
-<!ENTITY zlib-md5 "2ab442d169156f34c379c968f3f482dd">
+<!ENTITY zlib-version "1.2.8">
+<!ENTITY zlib-size "441 KB">
+<!ENTITY zlib-url "http://www.zlib.net/zlib-&zlib-version;.tar.xz">
+<!ENTITY zlib-md5 "28f1205d8dd2001f26fec1e8c2cebe37">
 <!ENTITY zlib-home "http://www.zlib.net/">
-<!ENTITY zlib-ch6-du "3.9 MB">
-<!ENTITY zlib-ch6-sbu "0.1 SBU">
+<!ENTITY zlib-ch6-du "4.6 MB">
+<!ENTITY zlib-ch6-sbu "less than 0.1 SBU">
 

+ 4 - 4
prologue/standards.xml

@@ -59,7 +59,7 @@
       <varlistentry>
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
-          <para>Bash, Binutils, Coreutils, Diffutils, File, Findutils, Gawk,
+          <para>Bash, Bc, Binutils, Coreutils, Diffutils, File, Findutils, Gawk,
                 Grep, Gzip, M4, Man-DB, Ncurses, Procps, Psmisc, Sed,
                 Shadow, Tar, Util-linux, Zlib</para>
         </listitem>
@@ -111,7 +111,7 @@
       <varlistentry>
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
-          <para>At, Batch (a part of At), Bc, Cpio, Ed, Fcrontab, Initd-tools,
+          <para>At, Batch (a part of At), Cpio, Ed, Fcrontab, Initd-tools,
           Lsb_release, PAM, Sendmail (or Postfix or Exim) </para>
         </listitem>
       </varlistentry>
@@ -128,7 +128,7 @@
         <listitem>
           <para>ATK, Cairo, Desktop-file-utils, Freetype, Fontconfig,
                 Glib2, GTK+2, Icon-naming-utils, Libjpeg, Libpng, Libxml2,
-                MesaLib, Pango, Qt3, Qt4, Xorg</para>
+                MesaLib, Pango, Qt4, Xorg</para>
         </listitem>
       </varlistentry>
 
@@ -178,7 +178,7 @@
       <varlistentry>
         <term><emphasis>LSB Desktop:</emphasis></term>
         <listitem>
-          <para>None</para>
+          <para>Qt3</para>
         </listitem>
       </varlistentry>