gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Procps-ng-3.3.6

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10099 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Bruce Dubbs 2013-01-22 23:27:01 +00:00
parent 5347651c84
commit ec9f9d4fc3
8 changed files with 94 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
appendices/dependencies.xml
View File

@ -412,7 +412,7 @@
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>Procps,Psmisc</seg> <seg>Procps-ng,Psmisc</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -1277,7 +1277,7 @@
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>Perl and Procps</seg> <seg>Perl and Procps-ng</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -1464,7 +1464,7 @@
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>Bash, GRUB, Inetutils, Less, Procps, Psmisc, Readline, Texinfo, <seg>Bash, GRUB, Inetutils, Less, Procps-ng, Psmisc, Readline, Texinfo,
Util-linux, and Vim</seg> Util-linux, and Vim</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -1528,7 +1528,7 @@
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>Iana-Etc and Procps</seg> <seg>Iana-Etc and Procps-ng</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -1620,7 +1620,7 @@
</segmentedlist> </segmentedlist>
<!-- Begin Procps dependency info --> <!-- Begin Procps dependency info -->
<bridgehead renderas="sect2" id="procps-dep">Procps</bridgehead> <bridgehead renderas="sect2" id="procps-dep">Procps-ng</bridgehead>
<segmentedlist> <segmentedlist>
<segtitle>&dependencies;</segtitle> <segtitle>&dependencies;</segtitle>
@ -1634,7 +1634,7 @@
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>No test suite available</seg> <seg>DejaGNU</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>

10
chapter01/changelog.xml
View File

@ -35,6 +35,16 @@
</itemizedlist> </itemizedlist>
</listitem> </listitem>
--> -->
<listitem>
<para>2013-01-21</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Upgrade to Procps-ng-3.3.6. Fixes
<ulink url="&lfs-ticket-root;3095">#3095</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>2013-01-20</para> <para>2013-01-20</para>
<itemizedlist> <itemizedlist>

14
chapter01/whatsnew.xml
View File

@ -163,9 +163,9 @@
<listitem> <listitem>
<para>Pkg-config &pkgconfig-version;</para> <para>Pkg-config &pkgconfig-version;</para>
</listitem> </listitem>
<!--<listitem> <listitem>
<para>Procps &procps-version;</para> <para>Procps-ng &procps-ng-version;</para>
</listitem>--> </listitem>
<listitem> <listitem>
<para>Psmisc &psmisc-version;</para> <para>Psmisc &psmisc-version;</para>
</listitem> </listitem>
@ -301,6 +301,14 @@
<para>patch-2.6.1-test_fix-1.patch</para> <para>patch-2.6.1-test_fix-1.patch</para>
</listitem> </listitem>
<listitem>
<para>procps-3.2.8-fix_HZ_errors-1.patch</para>
</listitem>
<listitem>
<para>procps-3.2.8-watch_unicode-1.patch</para>
</listitem>
<listitem> <listitem>
<para>sed-4.2.1-testsuite_fixes-1.patch</para> <para>sed-4.2.1-testsuite_fixes-1.patch</para>
</listitem> </listitem>

8
chapter03/packages.xml
View File

@ -459,11 +459,11 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>Procps (&procps-version;) - <token>&procps-size;</token>:</term> <term>Procps (&procps-ng-version;) - <token>&procps-ng-size;</token>:</term>
<listitem> <listitem>
<para>Home page: <ulink url="&procps-home;"/></para> <para>Home page: <ulink url="&procps-ng-home;"/></para>
<para>Download: <ulink url="&procps-url;"/></para> <para>Download: <ulink url="&procps-ng-url;"/></para>
<para>MD5 sum: <literal>&procps-md5;</literal></para> <para>MD5 sum: <literal>&procps-ng-md5;</literal></para>
</listitem> </listitem>
</varlistentry> </varlistentry>

2
chapter03/patches.xml
View File

@ -90,6 +90,7 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<!--
<varlistentry> <varlistentry>
<term>Procps HZ Errors Patch - <token>&procps-hz_fixes-patch-size;</token>:</term> <term>Procps HZ Errors Patch - <token>&procps-hz_fixes-patch-size;</token>:</term>
<listitem> <listitem>
@ -105,6 +106,7 @@
<para>MD5 sum: <literal>&procps-watch-patch-md5;</literal></para> <para>MD5 sum: <literal>&procps-watch-patch-md5;</literal></para>
</listitem> </listitem>
</varlistentry> </varlistentry>
-->
<varlistentry> <varlistentry>
<term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term> <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>

103
chapter06/procps.xml
View File

@ -6,62 +6,82 @@
]> ]>
<sect1 id="ch-system-procps" role="wrap"> <sect1 id="ch-system-procps" role="wrap">
<?dbhtml filename="procps.html"?> <?dbhtml filename="procps-ng.html"?>
<sect1info condition="script"> <sect1info condition="script">
<productname>procps</productname> <productname>procps-ng</productname>
<productnumber>&procps-version;</productnumber> <productnumber>&procps-ng-version;</productnumber>
<address>&procps-url;</address> <address>&procps-ng-url;</address>
</sect1info> </sect1info>
<title>Procps-&procps-version;</title> <title>Procps-&procps-ng-version;</title>
<indexterm zone="ch-system-procps"> <indexterm zone="ch-system-procps">
<primary sortas="a-Procps">Procps</primary> <primary sortas="a-Procps">Procps-ng</primary>
</indexterm> </indexterm>
<sect2 role="package"> <sect2 role="package">
<title/> <title/>
<para>The Procps package contains programs for monitoring processes.</para> <para>The Procps-ng package contains programs for monitoring processes.</para>
<segmentedlist> <segmentedlist>
<segtitle>&buildtime;</segtitle> <segtitle>&buildtime;</segtitle>
<segtitle>&diskspace;</segtitle> <segtitle>&diskspace;</segtitle>
<seglistitem> <seglistitem>
<seg>&procps-ch6-sbu;</seg> <seg>&procps-ng-ch6-sbu;</seg>
<seg>&procps-ch6-du;</seg> <seg>&procps-ng-ch6-du;</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
</sect2> </sect2>
<sect2 role="installation"> <sect2 role="installation">
<title>Installation of Procps</title> <title>Installation of Procps-ng</title>
<para>Apply a patch to prevent an error message from being displayed when <para>Now prepare procps-ng for compilation:</para>
determining the kernel clock tick rate:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&procps-hz_fixes-patch;</userinput></screen> <screen><userinput remap="configure">./configure --prefix= \
--mandir=/usr/share/man \
--docdir=/usr/share/doc/$PROGRAM \
--disable-skill \
--disable-kill</userinput></screen>
<para>Apply a patch to fix a unicode related issue in the <variablelist>
<command>watch</command> program:</para> <title>The meaning of the configure options:</title>
<screen><userinput remap="pre">patch -Np1 -i ../&procps-watch-patch;</userinput></screen> <varlistentry>
<term><parameter>--disable-skill</parameter></term>
<para>Do not install the kill program because it was installed by util-linux. <listitem>
Also fix a bug in the Makefile, which prevents procps from building with <para>This switch disables the obsolete and unportable
make-&make-version;:</para> skill and snice commands.</para>
</listitem>
<screen><userinput remap="pre">sed -i -e 's@\*/module.mk@proc/module.mk ps/module.mk@' \ </varlistentry>
-e 's@^#SKIP@SKIP@' Makefile</userinput></screen> <varlistentry>
<term><parameter>--disable-kill</parameter></term>
<listitem>
<para>This switch disables building the kill command that
was installed in the util-linux package.</para>
</listitem>
</varlistentry>
</variablelist>
<para>Compile the package:</para> <para>Compile the package:</para>
<screen><userinput remap="make">make</userinput></screen> <screen><userinput remap="make">make</userinput></screen>
<para>This package does not come with a test suite.</para> <para>The test suite needs some custom modifications for LFS.
The <command>which</command> is not available and the
<command>pmap</command> test does not match a newline character in
two tests. To run the test suite, run the following commands:</para>
<screen><userinput remap="test">pushd testsuite
sed -i 's|exec which sleep|exec echo /tools/bin/sleep|' config/unix.exp
sed -i 's|pmap_initname\\\$|pmap_initname|' pmap.test/pmap.exp
make site.exp
DEJAGNU=global-conf.exp runtest
popd</userinput></screen>
<para>Install the package:</para> <para>Install the package:</para>
@ -70,16 +90,16 @@
</sect2> </sect2>
<sect2 id="contents-procps" role="content"> <sect2 id="contents-procps" role="content">
<title>Contents of Procps</title> <title>Contents of Procps-ng</title>
<segmentedlist> <segmentedlist>
<segtitle>Installed programs</segtitle> <segtitle>Installed programs</segtitle>
<segtitle>Installed library</segtitle> <segtitle>Installed library</segtitle>
<seglistitem> <seglistitem>
<seg>free, pgrep, pkill, pmap, ps, pwdx, skill, slabtop, snice, <seg>free, pgrep, pkill, pmap, ps, pwdx, slabtop,
sysctl, tload, top, uptime, vmstat, w, and watch</seg> sysctl, tload, top, uptime, vmstat, w, and, watch</seg>
<seg>libproc.so</seg> <seg>libprocps.so</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -149,16 +169,6 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry id="skill">
<term><command>skill</command></term>
<listitem>
<para>Sends signals to processes matching the given criteria</para>
<indexterm zone="ch-system-procps skill">
<primary sortas="b-skill">skill</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="slabtop"> <varlistentry id="slabtop">
<term><command>slabtop</command></term> <term><command>slabtop</command></term>
<listitem> <listitem>
@ -169,17 +179,6 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry id="snice">
<term><command>snice</command></term>
<listitem>
<para>Changes the scheduling priority of processes matching the given
criteria</para>
<indexterm zone="ch-system-procps snice">
<primary sortas="b-snice">snice</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="sysctl"> <varlistentry id="sysctl">
<term><command>sysctl</command></term> <term><command>sysctl</command></term>
<listitem> <listitem>
@ -257,13 +256,13 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry id="libproc"> <varlistentry id="libprocps">
<term><filename class="libraryfile">libproc</filename></term> <term><filename class="libraryfile">libproc</filename></term>
<listitem> <listitem>
<para>Contains the functions used by most programs in this <para>Contains the functions used by most programs in this
package</para> package</para>
<indexterm zone="ch-system-procps libproc"> <indexterm zone="ch-system-procps libprocps">
<primary sortas="c-libproc">libproc</primary> <primary sortas="c-libprocps">libprocps</primary>
</indexterm> </indexterm>
</listitem> </listitem>
</varlistentry> </varlistentry>

4
general.ent
View File

@ -1,5 +1,5 @@
<!ENTITY version "SVN-20130120"> <!ENTITY version "SVN-20130121">
<!ENTITY releasedate "January 20, 2013"> <!ENTITY releasedate "January 21, 2013">
<!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; --> <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.3"> <!ENTITY milestone "7.3">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

14
packages.ent
View File

@ -437,13 +437,13 @@
<!ENTITY pkgconfig-ch6-du "30 MB"> <!ENTITY pkgconfig-ch6-du "30 MB">
<!ENTITY pkgconfig-ch6-sbu "0.4 SBU"> <!ENTITY pkgconfig-ch6-sbu "0.4 SBU">
<!ENTITY procps-version "3.2.8"> <!ENTITY procps-ng-version "3.3.6">
<!ENTITY procps-size "279 KB"> <!ENTITY procps-ng-size "528 KB">
<!ENTITY procps-url "http://procps.sourceforge.net/procps-&procps-version;.tar.gz"> <!ENTITY procps-ng-url "http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
<!ENTITY procps-md5 "9532714b6846013ca9898984ba4cd7e0"> <!ENTITY procps-ng-md5 "0a050d9be531921db3cd38f1371e73e3">
<!ENTITY procps-home "http://procps.sourceforge.net/"> <!ENTITY procps-ng-home "http://sourceforge.net/projects/procps-ng">
<!ENTITY procps-ch6-du "2.6 MB"> <!ENTITY procps-ng-ch6-du "13 MB">
<!ENTITY procps-ch6-sbu "0.1 SBU"> <!ENTITY procps-ng-ch6-sbu "0.2 SBU">
<!ENTITY psmisc-version "22.20"> <!ENTITY psmisc-version "22.20">
<!ENTITY psmisc-size "422 KB"> <!ENTITY psmisc-size "422 KB">