浏览代码

Merged trunk.

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

+ 62 - 1
chapter01/changelog.xml

@@ -36,7 +36,68 @@
     </listitem>
 -->
     <listitem>
-      <para>2014-11-01</para>
+      <para>2014-11-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.17.4. Fixes 
+          <ulink url="&lfs-ticket-root;3712">#3712</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kmod-19. Fixes 
+          <ulink url="&lfs-ticket-root;3713">#3713</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to grep-2.21. Fixes 
+          <ulink url="&lfs-ticket-root;3714">#3714</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-11-13</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata-2014j. Fixes 
+          <ulink url="&lfs-ticket-root;3710">#3710</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to tcl-8.6.3. Fixes 
+          <ulink url="&lfs-ticket-root;3711">#3711</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-11-11</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to bash-4.3.30. Fixes
+          <ulink url="&lfs-ticket-root;3708">#3708</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-db-2.7.1. Fixes
+          <ulink url="&lfs-ticket-root;3709">#3709</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add binutils-2.24-multiple_plugins-1.patch.
+          Thanks to Miklos Karacsony fro the patch.  Fixes
+          <ulink url="&lfs-ticket-root;3707">#3707</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-11-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to groff-1.22.3. Fixes 
+          <ulink url="&lfs-ticket-root;3706">#3706</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-11-03</para>
       <itemizedlist>
         <listitem>
           <para>[bdubbs] - Move the page concerning /etc/shells

+ 12 - 10
chapter01/whatsnew.xml

@@ -37,9 +37,9 @@
     <!--<listitem>
       <para>Automake &automake-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Bash &bash-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Binutils &binutils-version;</para>
     </listitem>-->
@@ -104,12 +104,12 @@
     <!--<listitem>
       <para>Gperf-&gperf-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Grep &grep-version;</para>
-    </listitem>-->
-    <!--<listitem>
+    </listitem>
+    <listitem>
       <para>Groff &groff-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>GRUB &grub-version;</para>
     </listitem>
@@ -131,9 +131,9 @@
     <!--<listitem>
       <para>Kbd &kbd-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Kmod &kmod-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Less &less-version;</para>
     </listitem>-->
@@ -200,9 +200,9 @@
     <!--<listitem>
       <para>Tar &tar-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>TCL &tcl-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Texinfo &texinfo-version;</para>
     </listitem>-->
@@ -239,9 +239,11 @@
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
+    <!--
     <listitem>
       <para>&bash-fixes-patch;</para>
     </listitem>
+    -->
 
     <listitem>
       <para>&perl-fix-patch;</para>

+ 10 - 2
chapter03/patches.xml

@@ -17,7 +17,7 @@
   needed to build an LFS system:</para>
 
   <variablelist role="materials">
-
+<!--
     <varlistentry>
       <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
       <listitem>
@@ -25,7 +25,7 @@
         <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Bc Memory Leak Patch - <token>&bc-memory-leak-patch-size;</token>:</term>
       <listitem>
@@ -50,6 +50,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Binutils Multiple Plugins Patch - <token>&binutils-multiple-plugins-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&binutils-multiple-plugins-patch;"/></para>
+        <para>MD5 sum: <literal>&binutils-multiple-plugins-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <listitem>

+ 2 - 2
chapter05/bash.xml

@@ -42,12 +42,12 @@
 
   <sect2 role="installation">
     <title>Installation of Bash</title>
-
+<!--
     <para>First, apply the following patch to fix various bugs that have been
     addressed upstream:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
-
+-->
     <para>Prepare Bash for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools --without-bash-malloc</userinput></screen>

+ 2 - 2
chapter06/bash.xml

@@ -39,12 +39,12 @@
 
   <sect2 role="installation">
     <title>Installation of Bash</title>
-
+<!--
     <para>First, apply the following patch to fix various bugs that have been
     addressed upstream:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
-
+-->
     <para>Prepare Bash for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr                    \

+ 4 - 0
chapter06/binutils.xml

@@ -73,6 +73,10 @@ sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-testsuite-patch;</userinput></screen>
 
+    <para>Enable binutils to recognize multiple plugins:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-multiple-plugins-patch;</userinput></screen>
+
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
 

+ 2 - 2
general.ent

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

+ 23 - 23
packages.ent

@@ -39,10 +39,10 @@
 <!ENTITY automake-ch6-du "107 MB">
 <!ENTITY automake-ch6-sbu "less than 0.1 SBU (about 12 SBU with tests)">
 
-<!ENTITY bash-version "4.3">
-<!ENTITY bash-size "7,770 KB">
+<!ENTITY bash-version "4.3.30">
+<!ENTITY bash-size "7,7791 KB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "81348932d5da294953e15d4814c74dd1">
+<!ENTITY bash-md5 "a27b3ee9be83bd3ba448c0ff52b28447">
 <!ENTITY bash-home "&gnu-software;bash/">
 <!ENTITY bash-ch5-du "53 MB">
 <!ENTITY bash-ch5-sbu "0.4 SBU">
@@ -257,20 +257,20 @@
 <!ENTITY gperf-ch6-du "5.5 MB">
 <!ENTITY gperf-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY grep-version "2.20">
-<!ENTITY grep-size "1,209 KB">
+<!ENTITY grep-version "2.21">
+<!ENTITY grep-size "1,232 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "2cbea44a4f1548aee20b9ff2d3076908">
+<!ENTITY grep-md5 "43c48064d6409862b8a850db83c8038a">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-ch5-du "18 MB">
 <!ENTITY grep-ch5-sbu "0.2 SBU">
 <!ENTITY grep-ch6-du "30 MB">
 <!ENTITY grep-ch6-sbu "0.5 SBU">
 
-<!ENTITY groff-version "1.22.2">
-<!ENTITY groff-size "3,926 KB">
+<!ENTITY groff-version "1.22.3">
+<!ENTITY groff-size "4,091 KB">
 <!ENTITY groff-url "&gnu;groff/groff-&groff-version;.tar.gz">
-<!ENTITY groff-md5 "9f4cd592a5efc7e36481d8d8d8af6d16">
+<!ENTITY groff-md5 "cc825fa64bc7306a885f2fb2268d3ec5">
 <!ENTITY groff-home "&gnu-software;groff/">
 <!ENTITY groff-ch6-du "83 MB">
 <!ENTITY groff-ch6-sbu "0.6 SBU">
@@ -333,10 +333,10 @@
 <!ENTITY kbd-ch6-du "28 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
 
-<!ENTITY kmod-version "18">
+<!ENTITY kmod-version "19">
 <!ENTITY kmod-size "1,440 KB">
 <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
-<!ENTITY kmod-md5 "82835c7f01983634e06ca72b4ee30cc6">
+<!ENTITY kmod-md5 "a08643f814aa4efc12211c6e5909f4d9">
 <!ENTITY kmod-home " ">
 <!ENTITY kmod-ch6-du "36 MB">
 <!ENTITY kmod-ch6-sbu "0.1 SBU">
@@ -375,12 +375,12 @@
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "17">
-<!ENTITY linux-patch-version "2">
+<!ENTITY linux-patch-version "4">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
-<!ENTITY linux-size "78,449 KB">
+<!ENTITY linux-size "78,455 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "87444e6f0906e2ec783cf0ed6aab1a56">
+<!ENTITY linux-md5 "ce49828adecf8908eb3a9ffc5b860d44">
 <!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,
@@ -413,10 +413,10 @@
 <!ENTITY make-ch6-du "11.8 MB">
 <!ENTITY make-ch6-sbu "0.5 SBU">
 
-<!ENTITY man-db-version "2.7.0.2">
-<!ENTITY man-db-size "1,457 KB">
+<!ENTITY man-db-version "2.7.1">
+<!ENTITY man-db-size "1,464 KB">
 <!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz">
-<!ENTITY man-db-md5 "8ea7be9daf7af7da0fcd619e3da3991c">
+<!ENTITY man-db-md5 "88d32360e2ed18e05de9b528ad336fd8">
 <!ENTITY man-db-home "http://www.nongnu.org/man-db/">
 <!ENTITY man-db-ch6-du "28 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
@@ -543,11 +543,11 @@
 <!ENTITY tar-ch6-du "39 MB">
 <!ENTITY tar-ch6-sbu "2.4 SBU">
 
-<!ENTITY tcl-version "8.6.2">
+<!ENTITY tcl-version "8.6.3">
 <!ENTITY tcl-major-version "8.6">
-<!ENTITY tcl-size "8,650 KB">
+<!ENTITY tcl-size "8,693 KB">
 <!ENTITY tcl-url "http://downloads.sourceforge.net/project/tcl/Tcl/&tcl-version;/tcl&tcl-version;-src.tar.gz">
-<!ENTITY tcl-md5 "8103eaf6d71acb716a64224492f09d5f">
+<!ENTITY tcl-md5 "db382feca91754b7f93da16dc4cdad1f">
 <!ENTITY tcl-home "http://tcl.sourceforge.net/">
 <!ENTITY tcl-ch5-du "61 MB">
 <!ENTITY tcl-ch5-sbu "0.9 SBU">
@@ -562,10 +562,10 @@
 <!ENTITY texinfo-ch6-du "99 MB">
 <!ENTITY texinfo-ch6-sbu "0.6 SBU">
 
-<!ENTITY tzdata-version "2014i">
-<!ENTITY tzdata-size "283 KB">
+<!ENTITY tzdata-version "2014j">
+<!ENTITY tzdata-size "284 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "00adeb62a0897aac5ba67da838351adb">
+<!ENTITY tzdata-md5 "2d7ea9c309f0d4e162e426e568290ca3">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 
 <!ENTITY util-linux-version "2.25.2">

+ 6 - 0
patches.ent

@@ -2,9 +2,11 @@
 
 <!-- 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">
@@ -14,6 +16,10 @@
 <!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-md5 "877e81fba316fe487ec23501059d54b8">
 <!ENTITY bc-memory-leak-patch-size "1.4 KB">