Changeset d2759bb

Timestamp:

Jan 30, 2011, 10:12:16 AM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

5765b29

Parents:

4ce7c10 (diff), 275bc81 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Files:

• BOOK/final-system/common/procps.xml (modified) (1 diff)
• BOOK/final-system/multilib/procps-64bit.xml (modified) (1 diff)
• BOOK/final-system/multilib/procps-n32.xml (modified) (1 diff)
• BOOK/final-system/multilib/procps.xml (modified) (1 diff)
• BOOK/general.ent (modified) (1 diff)
• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/materials/common/patches.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/procps-3.2.8-ps_cgroup-1.patch (added)

BOOK/final-system/common/procps.xml

@@ -26 +26 @@
     <title>Installation of Procps</title>
 
+    <para os="p1">The following patch adds process control group support to
+    ps:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&procps-pc_cgroup-patch;</userinput></screen>
+
     <para os="s1">The following fixes an issue with Make 3.82:</para>
 

BOOK/final-system/multilib/procps-64bit.xml

@@ -21 +21 @@
   <sect2 role="installation">
     <title>Installation of Procps</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/multilib/procps-n32.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of Procps</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/multilib/procps.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of Procps</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/general.ent

@@ -3 +3 @@
 <!ENTITY month "01"> <!-- Use two digits -->
 <!ENTITY month_name "January">
-<!ENTITY day "29"> <!-- Use two digits -->
+<!ENTITY day "30"> <!-- Use two digits -->
 <!ENTITY year "2011"> <!-- Use four digits -->
 

BOOK/introduction/common/changelog.xml

@@ -38 +38 @@
 
     <listitem>
-      <para>January 8, 2011</para>
+      <para>January 30, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Patch procps so that ps supports process control
+          groups.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>January 29, 2011</para>
       <itemizedlist>
         <listitem>

BOOK/materials/common/patches.xml

@@ -119 +119 @@
 
     <varlistentry>
+      <term>Procps ps cgroup Patch - <token>&procps-ps_cgroup-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&procps-ps_cgroup-patch;"/></para>
+        <para>MD5 sum: <literal>&procps-ps_cgroup-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Readline Branch Update - <token>&readline-branch_update-patch-size;</token>:</term>
       <listitem>

BOOK/patches.ent

@@ -52 +52 @@
 <!ENTITY perl-libc-patch-md5 "d572b0cc87b35f1806fd84f88803fb66">
 <!ENTITY perl-libc-patch-size "4 KB">
+
+<!ENTITY procps-ps_cgroup-patch "procps-&procps-version;-ps_cgroup-1.patch">
+<!ENTITY procps-ps_cgroup-patch-md5 "3c478ef88fad23353e332b1b850ec630">
+<!ENTITY procps-ps_cgroup-patch-size "4 KB">
 
 <!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-1.patch">