浏览代码

Merged trunk.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10810 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Krejzi 10 年之前
父节点
当前提交
cae17709ba
共有 9 个文件被更改,包括 74 次插入83 次删除
  1. 32 0
      chapter01/changelog.xml
  2. 14 2
      chapter01/whatsnew.xml
  3. 2 2
      chapter03/patches.xml
  4. 2 14
      chapter06/binutils.xml
  5. 3 2
      chapter06/glibc.xml
  6. 1 1
      chapter06/iproute2.xml
  7. 2 2
      general.ent
  8. 18 18
      packages.ent
  9. 0 42
      patches.ent

+ 32 - 0
chapter01/changelog.xml

@@ -35,6 +35,38 @@
       </itemizedlist>
       </itemizedlist>
     </listitem>
     </listitem>
 -->
 -->
+    <listitem>
+      <para>2014-12-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-3.18.0. Fixes 
+          <ulink url="&lfs-ticket-root;3726">#3726</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.19.4. Fixes 
+          <ulink url="&lfs-ticket-root;3725">#3725</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-12-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.18.1. Fixes 
+          <ulink url="&lfs-ticket-root;3721">#3721</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xz-5.2.0. Fixes 
+          <ulink url="&lfs-ticket-root;3723">#3723</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to binutils-2.25. Fixes 
+          <ulink url="&lfs-ticket-root;3724">#3724</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
     <listitem>
       <para>2014-12-21</para>
       <para>2014-12-21</para>
       <itemizedlist>
       <itemizedlist>

+ 14 - 2
chapter01/whatsnew.xml

@@ -40,9 +40,9 @@
     <listitem>
     <listitem>
       <para>Bash &bash-version;</para>
       <para>Bash &bash-version;</para>
     </listitem>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Binutils &binutils-version;</para>
       <para>Binutils &binutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
     <!--<listitem>
       <para>Bison &bison-version;</para>
       <para>Bison &bison-version;</para>
     </listitem>-->
     </listitem>-->
@@ -263,6 +263,18 @@
     <title>Removed:</title>
     <title>Removed:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
 
+    <listitem>
+      <para>binutils-2.24-load_gcc_lto_plugin_by_default-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>binutils-2.24-lto_testsuite-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>binutils-2.24-multiple_plugins-1.patch</para>
+    </listitem>
+
     <listitem>
     <listitem>
       <para>bash-4.3-upstream_fixes-3.patch</para>
       <para>bash-4.3-upstream_fixes-3.patch</para>
     </listitem>
     </listitem>

+ 2 - 2
chapter03/patches.xml

@@ -33,7 +33,7 @@
         <para>MD5 sum: <literal>&bc-memory-leak-patch-md5;</literal></para>
         <para>MD5 sum: <literal>&bc-memory-leak-patch-md5;</literal></para>
       </listitem>
       </listitem>
     </varlistentry>
     </varlistentry>
-
+<!--
     <varlistentry>
     <varlistentry>
       <term>Binutils LTO Patch - <token>&binutils-lto-patch-size;</token>:</term>
       <term>Binutils LTO Patch - <token>&binutils-lto-patch-size;</token>:</term>
       <listitem>
       <listitem>
@@ -57,7 +57,7 @@
         <para>MD5 sum: <literal>&binutils-multiple-plugins-patch-md5;</literal></para>
         <para>MD5 sum: <literal>&binutils-multiple-plugins-patch-md5;</literal></para>
       </listitem>
       </listitem>
     </varlistentry>
     </varlistentry>
-
+-->
     <varlistentry>
     <varlistentry>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <listitem>
       <listitem>

+ 2 - 14
chapter06/binutils.xml

@@ -56,19 +56,7 @@
 
 
 <screen><computeroutput>The system has no more ptys.
 <screen><computeroutput>The system has no more ptys.
 Ask your system administrator to create more.</computeroutput></screen>
 Ask your system administrator to create more.</computeroutput></screen>
-
-    <para>Suppress the installation of an outdated
-    <filename>standards.info</filename> file as a newer one is installed later
-    on in the Autoconf instructions:</para>
-
-<screen><userinput remap="pre">rm -fv etc/standards.info
-sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
-
-    <para>Add an upstream patch to use GCC's link time optimization (LTO) 
-    by default:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-patch;</userinput></screen>
-
+<!--
     <para>Fix some LTO tests in the test suite:</para>
     <para>Fix some LTO tests in the test suite:</para>
 
 
 <screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-testsuite-patch;</userinput></screen>
 <screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-testsuite-patch;</userinput></screen>
@@ -76,7 +64,7 @@ sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
     <para>Enable binutils to recognize multiple plugins:</para>
     <para>Enable binutils to recognize multiple plugins:</para>
 
 
 <screen><userinput remap="pre">patch -Np1 -i ../&binutils-multiple-plugins-patch;</userinput></screen>
 <screen><userinput remap="pre">patch -Np1 -i ../&binutils-multiple-plugins-patch;</userinput></screen>
-
+-->
     <para>The Binutils documentation recommends building Binutils outside of the
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
     source directory in a dedicated build directory:</para>
 
 

+ 3 - 2
chapter06/glibc.xml

@@ -117,9 +117,10 @@ cd ../glibc-build</userinput></screen>
     <itemizedlist>
     <itemizedlist>
 
 
       <listitem>
       <listitem>
-        <para>The <emphasis>tst/tst-cputimer1</emphasis> test has been known to
+        <para>The <emphasis>tst/tst-cputimer1</emphasis> and 
+        <emphasis>rt/tst-cpuclock2</emphasis> tests have been known to
         fail.  The reason is not completely understood, but indications are
         fail.  The reason is not completely understood, but indications are
-        that minor timing issues can trigger this failure.</para>
+        that minor timing issues can trigger these failures.</para>
       </listitem>
       </listitem>
 
 
       <listitem>
       <listitem>

+ 1 - 1
chapter06/iproute2.xml

@@ -88,7 +88,7 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
         <seg>bridge, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
         <seg>bridge, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
         and tc</seg>
         and tc</seg>
-        <seg>/etc/iproute2, /lib/tc, /usr/share/doc/iproute2-&iproute2-version;,
+        <seg>/etc/iproute2, /usr/lib/tc, /usr/share/doc/iproute2-&iproute2-version;,
         /usr/lib/tc</seg>
         /usr/lib/tc</seg>
       </seglistitem>
       </seglistitem>
     </segmentedlist>
     </segmentedlist>

+ 2 - 2
general.ent

@@ -1,6 +1,6 @@
-<!ENTITY version         "20141221-systemd">
+<!ENTITY version         "20141228-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "December 21, 2014">
+<!ENTITY releasedate     "December 28, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.7">
 <!ENTITY milestone       "7.7">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

+ 18 - 18
packages.ent

@@ -57,11 +57,11 @@
 <!ENTITY bc-ch6-du "3.6 MB">
 <!ENTITY bc-ch6-du "3.6 MB">
 <!ENTITY bc-ch6-sbu "0.2 SBU">
 <!ENTITY bc-ch6-sbu "0.2 SBU">
 
 
-<!ENTITY binutils-version "2.24">
-<!ENTITY binutils-size "22,184 KB">
+<!ENTITY binutils-version "2.25">
+<!ENTITY binutils-size "23,486 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "e0f71a7b2ddab0f8612336ac81d9636b">
-<!ENTITY binutils-home "$gnu-software;binutils/">
+<!ENTITY binutils-md5 "d9f3303f802a5b6b0bb73a335ab89d66">
+<!ENTITY binutils-home "&gnu-software;binutils/">
 <!ENTITY binutils-ch5p1-du "445 MB">
 <!ENTITY binutils-ch5p1-du "445 MB">
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
 <!ENTITY binutils-ch5p2-du "448 MB">
 <!ENTITY binutils-ch5p2-du "448 MB">
@@ -220,10 +220,10 @@
 <!ENTITY gdbm-ch6-du "10.9 MB">
 <!ENTITY gdbm-ch6-du "10.9 MB">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 
 
-<!ENTITY gettext-version "0.19.3">
-<!ENTITY gettext-size "6,474 KB">
+<!ENTITY gettext-version "0.19.4">
+<!ENTITY gettext-size "6,501 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "092c3f460553ceb4a638ff81d36434c4">
+<!ENTITY gettext-md5 "997c9070354eff5517115feaea6038f0">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "140 MB">
 <!ENTITY gettext-ch5-du "140 MB">
 <!ENTITY gettext-ch5-sbu "0.7 SBU">
 <!ENTITY gettext-ch5-sbu "0.7 SBU">
@@ -317,10 +317,10 @@
 <!ENTITY intltool-ch6-du "1.3 MB">
 <!ENTITY intltool-ch6-du "1.3 MB">
 <!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
 <!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
 
 
-<!ENTITY iproute2-version "3.17.0">
-<!ENTITY iproute2-size "430 KB">
+<!ENTITY iproute2-version "3.18.0">
+<!ENTITY iproute2-size "438 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "b741a02c6dda5818d18011d572874493">
+<!ENTITY iproute2-md5 "6f6ad51a00007880460e103367b16057">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "8.3 MB">
 <!ENTITY iproute2-ch6-du "8.3 MB">
 <!ENTITY iproute2-ch6-sbu "0.2 SBU">
 <!ENTITY iproute2-ch6-sbu "0.2 SBU">
@@ -375,12 +375,12 @@
 
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "18">
 <!ENTITY linux-minor-version "18">
-<!ENTITY linux-patch-version "x">
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
-<!ENTITY linux-size "79,038 KB">
+<!ENTITY linux-patch-version "1">
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
+<!ENTITY linux-size "79,040 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "9e854df51ca3fef8bfe566dbd7b89241">
+<!ENTITY linux-md5 "79c9b73a01e1dce0a4c28828496ef02c">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
 <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -595,10 +595,10 @@
 <!ENTITY xml-parser-ch6-du "2.0 MB">
 <!ENTITY xml-parser-ch6-du "2.0 MB">
 <!ENTITY xml-parser-ch6-sbu "less than 0.1 SBU">
 <!ENTITY xml-parser-ch6-sbu "less than 0.1 SBU">
 
 
-<!ENTITY xz-version "5.0.7">
-<!ENTITY xz-size "917 KB">
+<!ENTITY xz-version "5.2.0">
+<!ENTITY xz-size "984 KB">
 <!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.xz">
 <!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.xz">
-<!ENTITY xz-md5 "d0456c2c3ea3c356369807eef1e2ae65">
+<!ENTITY xz-md5 "d87c242778fcf5ce4598de80a55ded28">
 <!ENTITY xz-home "http://tukaani.org/xz">
 <!ENTITY xz-home "http://tukaani.org/xz">
 <!ENTITY xz-ch5-du "15.9 MB">
 <!ENTITY xz-ch5-du "15.9 MB">
 <!ENTITY xz-ch5-sbu "0.2 SBU">
 <!ENTITY xz-ch5-sbu "0.2 SBU">

+ 0 - 42
patches.ent

@@ -2,24 +2,6 @@
 
 
 <!-- Start of Common Patches -->
 <!-- Start of Common Patches -->
 
 
-<!--
-<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-7.patch">
-<!ENTITY bash-fixes-patch-md5 "ccf2f526dda9405a6a9fc9b8ceff11c4">
-<!ENTITY bash-fixes-patch-size "88 KB">
--->
-
-<!ENTITY binutils-lto-patch "binutils-&binutils-version;-load_gcc_lto_plugin_by_default-1.patch">
-<!ENTITY binutils-lto-patch-md5 "48e4e96a60bfed41804aaecf4944f5d9">
-<!ENTITY binutils-lto-patch-size "2.0 KB">
-
-<!ENTITY binutils-lto-testsuite-patch "binutils-&binutils-version;-lto_testsuite-1.patch">
-<!ENTITY binutils-lto-testsuite-patch-md5 "a6647fdb3cca512962bb1433bb6b4f9f">
-<!ENTITY binutils-lto-testsuite-patch-size "3.0 KB">
-
-<!ENTITY binutils-multiple-plugins-patch "binutils-&binutils-version;-multiple_plugins-1.patch">
-<!ENTITY binutils-multiple-plugins-patch-md5 "d01a4d846ba7539ab7fa306c048e1357">
-<!ENTITY binutils-multiple-plugins-patch-size "3.6 KB">
-
 <!ENTITY bc-memory-leak-patch "bc-&bc-version;-memory_leak-1.patch">
 <!ENTITY bc-memory-leak-patch "bc-&bc-version;-memory_leak-1.patch">
 <!ENTITY bc-memory-leak-patch-md5 "877e81fba316fe487ec23501059d54b8">
 <!ENTITY bc-memory-leak-patch-md5 "877e81fba316fe487ec23501059d54b8">
 <!ENTITY bc-memory-leak-patch-size "1.4 KB">
 <!ENTITY bc-memory-leak-patch-size "1.4 KB">
@@ -32,23 +14,6 @@
 <!ENTITY coreutils-i18n-patch-md5 "587051bc411e0da9b3bf8984b49b364e">
 <!ENTITY coreutils-i18n-patch-md5 "587051bc411e0da9b3bf8984b49b364e">
 <!ENTITY coreutils-i18n-patch-size "138 KB">
 <!ENTITY coreutils-i18n-patch-size "138 KB">
 
 
-<!--
-<!ENTITY coreutils-shuf-segfault-patch "coreutils-&coreutils-version;-shuf_segfault-1.patch">
-<!ENTITY coreutils-shuf-segfault-patch-md5 "f1b5b35392914e327b1b6bbbb454d256">
-<!ENTITY coreutils-shuf-segfault-patch-size "4 KB">
--->
-<!--
-<!ENTITY e2fsprogs-fix-test-patch "e2fsprogs-&e2fsprogs-version;-fix_test-1.patch">
-<!ENTITY e2fsprogs-fix-test-patch-md5 "7c20605628536db298bb3bb4666047bf">
-<!ENTITY e2fsprogs-fix-test-patch-size "0.7 KB">
--->
-
-<!--
-<!ENTITY gcc-upstream-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
-<!ENTITY gcc-upstream-patch-md5 "015e026dff5052cd65906ee0bb8f25e8">
-<!ENTITY gcc-upstream-patch-size "8.6 KB">
--->
-
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
@@ -72,10 +37,3 @@
 <!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
 <!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
 <!ENTITY systemd-compat-patch-md5 "eb9f302cb72595c9011300a1b28f1d1a">
 <!ENTITY systemd-compat-patch-md5 "eb9f302cb72595c9011300a1b28f1d1a">
 <!ENTITY systemd-compat-patch-size "12 KB">
 <!ENTITY systemd-compat-patch-size "12 KB">
-
-<!--
-<!ENTITY tar-manpage-patch "tar-&tar-version;-manpage-1.patch">
-<!ENTITY tar-manpage-patch-md5 "321f85ec32733b1a9399e788714a5156">
-<!ENTITY tar-manpage-patch-size "7.8 KB">
--->
-