Browse Source

Move Psmisc to before E2fsprogs to fix issues with E2fsprogs' testsuite. Fixes #2975.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9685 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess 13 năm trước cách đây
mục cha
commit
634aa8990c
4 tập tin đã thay đổi với 15 bổ sung4 xóa
  1. 1 1
      appendices/dependencies.xml
  2. 11 0
      chapter01/changelog.xml
  3. 1 1
      chapter06/chapter06.xml
  4. 2 2
      general.ent

+ 1 - 1
appendices/dependencies.xml

@@ -412,7 +412,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Psmisc</seg>
         </seglistitem>
       </segmentedlist>
 

+ 11 - 0
chapter01/changelog.xml

@@ -36,6 +36,17 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2011-12-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Move Psmisc to before E2fsprogs because the
+          E2fsprogs testsuite uses killall. Fixes
+          <ulink url="&lfs-ticket-root;2975">#2975</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2011-12-01</para>
       <itemizedlist>

+ 1 - 1
chapter06/chapter06.xml

@@ -32,6 +32,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
@@ -64,7 +65,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>

+ 2 - 2
general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20111201">
-<!ENTITY releasedate "Dec 1 30, 2011">
+<!ENTITY version "SVN-20111205">
+<!ENTITY releasedate "Dec 5 30, 2011">
 <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.1">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->