[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.0.0-731-gd6db500
git
git at cross-lfs.org
Fri Jan 10 11:46:23 PST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, systemd has been updated
via d6db500f0e4ccabbced4dabb073db3b7761ee250 (commit)
via 5e137e41fb0a7653533ce79aac38a10f67a0f7dc (commit)
via 83f2f46a1fda6d97c92cd083821defecacbaffb3 (commit)
via d228eefe7780f9b32819d426c75cb603b428ebc5 (commit)
via d19e0a6f8a07083ff2209a9176b84e1f5c2eb7cd (commit)
via 0451a7a23fe4e416eba35a694b91bf576017a327 (commit)
via 8184788abe4e5b0abe6f341d6f4234f5b55db4b7 (commit)
via 7b0fa4abda913f53ac8f8b871e8886cb901d80ad (commit)
via 00ef22d79657a995bacf5129f936b08c592502fc (commit)
via cdc2a3e57c1196b9a2223c523d20bdd654dc45b7 (commit)
via 2700ccd7efd4f5b5fb24752ff4560e237ffd2bad (commit)
via 3e0a2c16d5392793257447440c90cf8cbe9cc6a0 (commit)
via ebf97379a93541fcc348ad038699546b9bdba97e (commit)
via c161fff5be2e4a43ccaa0795bbff2383e92cc4dc (commit)
via 413f061597b4f14376b80db00206364426d83077 (commit)
via 34f15293c1bba9a4d85833fd374df70bb2461841 (commit)
via 7389805ffdc22a441f7210dafc193eb229373e2f (commit)
from 2e0b90afc7c01ccb21a352400f2296f1d4cdb677 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d6db500f0e4ccabbced4dabb073db3b7761ee250
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:41:43 2014 -0600
Remove the procps patches as they are no longer needed.
diff --git a/patches/procps-3.2.8-fix_HZ_errors-1.patch b/patches/procps-3.2.8-fix_HZ_errors-1.patch
deleted file mode 100644
index 287d2ac..0000000
--- a/patches/procps-3.2.8-fix_HZ_errors-1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
-Date: 2010-09-20
-Initial Package Version: 3.2.8
-Origin: Debian 30_sysinfo_7numbers.patch
-Upstream Status: Submitted
-Description: Fixes "unknown HZ value (##)" errors in procps utils.
-
-diff -Naurp procps-3.2.8-orig//proc/sysinfo.c procps-3.2.8//proc/sysinfo.c
---- procps-3.2.8-orig//proc/sysinfo.c 2008-03-23 23:33:43.000000000 -0500
-+++ procps-3.2.8//proc/sysinfo.c 2010-09-20 01:13:36.000000000 -0500
-@@ -124,24 +124,25 @@ int uptime(double *restrict uptime_secs,
- unsigned long long Hertz;
-
- static void old_Hertz_hack(void){
-- unsigned long long user_j, nice_j, sys_j, other_j; /* jiffies (clock ticks) */
-+ unsigned long long user_j, nice_j, sys_j, other_j, wait_j, hirq_j, sirq_j, stol_j; /* jiffies (clock ticks) */
- double up_1, up_2, seconds;
- unsigned long long jiffies;
- unsigned h;
- char *restrict savelocale;
-
-+ wait_j = hirq_j = sirq_j = stol_j = 0;
- savelocale = setlocale(LC_NUMERIC, NULL);
- setlocale(LC_NUMERIC, "C");
- do{
- FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_1);
- /* uptime(&up_1, NULL); */
- FILE_TO_BUF(STAT_FILE,stat_fd);
-- sscanf(buf, "cpu %Lu %Lu %Lu %Lu", &user_j, &nice_j, &sys_j, &other_j);
-+ sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &user_j, &nice_j, &sys_j, &other_j, &wait_j, &hirq_j, &sirq_j, &stol_j);
- FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_2);
- /* uptime(&up_2, NULL); */
- } while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */
- setlocale(LC_NUMERIC, savelocale);
-- jiffies = user_j + nice_j + sys_j + other_j;
-+ jiffies = user_j + nice_j + sys_j + other_j + wait_j + hirq_j + sirq_j + stol_j ;
- seconds = (up_1 + up_2) / 2;
- h = (unsigned)( (double)jiffies/seconds/smp_num_cpus );
- /* actual values used by 2.4 kernels: 32 64 100 128 1000 1024 1200 */
-@@ -221,12 +222,13 @@ static void init_libproc(void){
- // _SC_NPROCESSORS_ONLN returns 1, which should work OK
- smp_num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
- if(smp_num_cpus<1) smp_num_cpus=1; /* SPARC glibc is buggy */
--
-+#ifdef __linux__
- if(linux_version_code > LINUX_VERSION(2, 4, 0)){
- Hertz = find_elf_note(AT_CLKTCK);
- if(Hertz!=NOTE_NOT_FOUND) return;
- fputs("2.4+ kernel w/o ELF notes? -- report this\n", stderr);
- }
-+#endif
- old_Hertz_hack();
- }
-
diff --git a/patches/procps-3.2.8-ps_cgroup-1.patch b/patches/procps-3.2.8-ps_cgroup-1.patch
deleted file mode 100644
index fb51448..0000000
--- a/patches/procps-3.2.8-ps_cgroup-1.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Submitted By: Joe Ciccone <jciccone at gmail.com>
-Date: 2011-01-30
-Initial Package Version: 3.2.7
-Origin: Fedora Git
- http://pkgs.fedoraproject.org/gitweb/?p=procps.git;a=blob_plain;f=procps-3.2.7-ps-cgroup.patch;h=b638c4f9a826040099f10e9282aad0d31ec5f03f;hb=HEAD
- http://pkgs.fedoraproject.org/gitweb/?p=procps.git;a=blob_plain;f=procps-3.2.8-ps-cgroup-suppress-root-group.patch;h=4b192c1fb4aa7684b7e57606713ca68690d77845;hb=HEAD
-Upstream Status: Unknown
-Description: Adds the ability for ps to output process(es) cgroups.
-
-diff -Naur procps-3.2.8.orig/ps/output.c procps-3.2.8/ps/output.c
---- procps-3.2.8.orig/ps/output.c 2009-05-10 15:24:50.000000000 -0400
-+++ procps-3.2.8/ps/output.c 2011-01-30 12:58:30.530497002 -0500
-@@ -1099,6 +1099,46 @@
- return snprintf(outbuf, COLWID, "*");
- }
-
-+static int pr_cgroup(char *restrict const outbuf, const proc_t *restrict const pp){
-+ char filename[48];
-+ FILE *fd;
-+ int counter = 0, last_begin = 0, slash = 0;
-+ int c;
-+ int is_cgroup = 0;
-+
-+ outbuf[0]='\0';
-+ snprintf(filename, sizeof filename, "/proc/%d/cgroup", pp->tgid);
-+ fd = fopen(filename, "r");
-+ if (likely(fd == NULL)) goto fail;
-+ while (( (c = fgetc(fd)) != EOF) && (counter<665)) {
-+ if (is_cgroup == 0) {
-+ if (c == ':') {
-+ is_cgroup = 1;
-+ slash = 0;
-+ if (counter>0)
-+ outbuf[counter++]=';';
-+ }
-+ }else
-+ if ((c == '\n') || (c == '\0')){
-+ if (slash) /* if the last char was a / this process is in the root cgroup which we should suppress */
-+ counter = last_begin;
-+ else
-+ last_begin = counter;
-+ is_cgroup = 0;
-+ } else {
-+ slash = c == '/';
-+ outbuf[counter++]=c;
-+ }
-+ }
-+ outbuf[counter]='\0';
-+ close(fd);
-+ if (counter>0)
-+ return counter;
-+fail:
-+ outbuf[0] = '-';
-+ outbuf[1] = '\0';
-+ return 1;
-+}
-
- /****************** FLASK & seLinux security stuff **********************/
- // move the bulk of this to libproc sometime
-@@ -1293,6 +1333,7 @@
- {"bsdtime", "TIME", pr_bsdtime, sr_nop, 6, 0, LNX, ET|RIGHT},
- {"c", "C", pr_c, sr_pcpu, 2, 0, SUN, ET|RIGHT},
- {"caught", "CAUGHT", pr_sigcatch, sr_nop, 9, 0, BSD, TO|SIGNAL}, /*sigcatch*/
-+{"cgroup", "CGROUP", pr_cgroup, sr_nop, 35, 0, LNX, PO|LEFT}, /* cgroups*/
- {"class", "CLS", pr_class, sr_sched, 3, 0, XXX, TO|LEFT},
- {"cls", "CLS", pr_class, sr_sched, 3, 0, HPU, TO|RIGHT}, /*says HPUX or RT*/
- {"cmaj_flt", "-", pr_nop, sr_cmaj_flt, 1, 0, LNX, AN|RIGHT},
-diff -Naur procps-3.2.8.orig/ps/ps.1 procps-3.2.8/ps/ps.1
---- procps-3.2.8.orig/ps/ps.1 2009-05-10 15:38:17.000000000 -0400
-+++ procps-3.2.8/ps/ps.1 2011-01-30 12:58:08.382497001 -0500
-@@ -904,6 +904,10 @@
- displayed. (alias\ \fBsig_catch\fR,\ \fBsigcatch\fR).
- T}
-
-+cgroup CGROUP T{
-+display control groups to which the process belonges.
-+T}
-+
- class CLS T{
- scheduling class of the process. (alias\ \fBpolicy\fR,\ \fBcls\fR).
- Field's possible values are:
commit 5e137e41fb0a7653533ce79aac38a10f67a0f7dc
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:41:23 2014 -0600
Renamed all procps*.xml to procps-ng*.xml. These are no longer valid entries for anything. No longer valid files, either.
diff --git a/BOOK/final-system/common/procps.xml b/BOOK/final-system/common/procps.xml
deleted file mode 100644
index 291c63f..0000000
--- a/BOOK/final-system/common/procps.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-system-procps" role="wrap">
- <?dbhtml filename="procps.html"?>
-
- <title>Procps-&procps-version;</title>
-
- <indexterm zone="ch-system-procps">
- <primary sortas="a-Procps">Procps</primary>
- </indexterm>
-
- <sect2 role="package">
- <title/>
-
- <para>The Procps package contains programs for monitoring
- processes.</para>
-
- </sect2>
-
- <sect2 role="installation">
- <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-ps_cgroup-patch;</userinput></screen>
-
- <para os="p3">The following patch fixes an issue where some procps utils
- print an error on the screen if the monitor isn't running at 60Hz:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&procps-fix_HZ_errors-patch;</userinput></screen>
-
- <para os="s1">The following fixes an issue with Make &make-version;:</para>
-
-<screen os="s2"><userinput>sed -i -r '/^-include/s/\*(.*)/proc\1 ps\1/' Makefile</userinput></screen>
-
- <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make</userinput></screen>
-
- <para os="c">This package does not come with a test suite.</para>
-
- <para os="d">Install the package:</para>
-
-<screen os="e"><userinput>make SKIP='/bin/kill /usr/share/man/man1/kill.1' install</userinput></screen>
-
- </sect2>
-
- <sect2 id="contents-procps" role="content">
- <title>Contents of Procps</title>
-
- <segmentedlist>
- <segtitle>Installed programs</segtitle>
- <segtitle>Installed library</segtitle>
-
- <seglistitem>
- <seg>free, pgrep, pkill, pmap, ps, pwdx, skill, slabtop, snice, sysctl,
- tload, top, uptime, vmstat, w, and watch</seg>
- <seg>libproc.so</seg>
- </seglistitem>
- </segmentedlist>
-
- <variablelist>
- <bridgehead renderas="sect3">Short Descriptions</bridgehead>
- <?dbfo list-presentation="list"?>
- <?dbhtml list-presentation="table"?>
-
- <varlistentry id="free">
- <term><command>free</command></term>
- <listitem>
- <para>Reports the amount of free and used memory (both physical and
- swap memory) in the system</para>
- <indexterm zone="ch-system-procps free">
- <primary sortas="b-free">free</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="pgrep">
- <term><command>pgrep</command></term>
- <listitem>
- <para>Looks up processes based on their name and other attributes</para>
- <indexterm zone="ch-system-procps pgrep">
- <primary sortas="b-pgrep">pgrep</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="pkill">
- <term><command>pkill</command></term>
- <listitem>
- <para>Signals processes based on their name and other attributes</para>
- <indexterm zone="ch-system-procps pkill">
- <primary sortas="b-pkill">pkill</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="pmap">
- <term><command>pmap</command></term>
- <listitem>
- <para>Reports the memory map of the given process</para>
- <indexterm zone="ch-system-procps pmap">
- <primary sortas="b-pmap">pmap</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="ps">
- <term><command>ps</command></term>
- <listitem>
- <para>Lists the current running processes</para>
- <indexterm zone="ch-system-procps ps">
- <primary sortas="b-ps">ps</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="pwdx">
- <term><command>pwdx</command></term>
- <listitem>
- <para>Reports the current working directory of a process</para>
- <indexterm zone="ch-system-procps pwdx">
- <primary sortas="b-pwdx">pwdx</primary>
- </indexterm>
- </listitem>
- </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">
- <term><command>slabtop</command></term>
- <listitem>
- <para>Displays detailed kernel slab cache information in real time</para>
- <indexterm zone="ch-system-procps slabtop">
- <primary sortas="b-slabtop">slabtop</primary>
- </indexterm>
- </listitem>
- </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">
- <term><command>sysctl</command></term>
- <listitem>
- <para>Modifies kernel parameters at run time</para>
- <indexterm zone="ch-system-procps sysctl">
- <primary sortas="b-sysctl">sysctl</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="tload">
- <term><command>tload</command></term>
- <listitem>
- <para>Prints a graph of the current system load average</para>
- <indexterm zone="ch-system-procps tload">
- <primary sortas="b-tload">tload</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="top">
- <term><command>top</command></term>
- <listitem>
- <para>Displays a list of the most CPU intensive processes; it
- provides an ongoing look at processor activity in real time</para>
- <indexterm zone="ch-system-procps top">
- <primary sortas="b-top">top</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="uptime">
- <term><command>uptime</command></term>
- <listitem>
- <para>Reports how long the system has been running, how many users are
- logged on, and the system load averages</para>
- <indexterm zone="ch-system-procps uptime">
- <primary sortas="b-uptime">uptime</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="vmstat">
- <term><command>vmstat</command></term>
- <listitem>
- <para>Reports virtual memory statistics, giving information about
- processes, memory, paging, block Input/Output (IO), traps, and CPU
- activity</para>
- <indexterm zone="ch-system-procps vmstat">
- <primary sortas="b-vmstat">vmstat</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="w">
- <term><command>w</command></term>
- <listitem>
- <para>Shows which users are currently logged on, where, and since
- when</para>
- <indexterm zone="ch-system-procps w">
- <primary sortas="b-w">w</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="watch">
- <term><command>watch</command></term>
- <listitem>
- <para>Runs a given command repeatedly, displaying the first
- screen-full of its output; this allows a user to watch the output
- change over time</para>
- <indexterm zone="ch-system-procps watch">
- <primary sortas="b-watch">watch</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libproc">
- <term><filename class="libraryfile">libproc</filename></term>
- <listitem>
- <para>Contains the functions used by most programs in this
- package</para>
- <indexterm zone="ch-system-procps libproc">
- <primary sortas="c-libproc">libproc</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- </sect2>
-
-</sect1>
diff --git a/BOOK/final-system/multilib/procps-64bit.xml b/BOOK/final-system/multilib/procps-64bit.xml
deleted file mode 100644
index dfa840f..0000000
--- a/BOOK/final-system/multilib/procps-64bit.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-system-procps" role="wrap">
- <?dbhtml filename="procps-64bit.html"?>
-
- <title>Procps-&procps-version; 64 Bit</title>
-
- <indexterm zone="ch-system-procps">
- <primary sortas="a-Procps">Procps</primary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of Procps</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='p1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='p3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='p4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='s1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='s2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" m64=""</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make SKIP='/bin/kill /usr/share/man/man1/kill.1' install lib64=lib64</userinput></screen>
-
- <variablelist os="f">
- <title>The meaning of the make and install options:</title>
-
- <varlistentry os="f1">
- <term><parameter>CC="gcc ${BUILD64}"</parameter></term>
- <listitem>
- <para>This allows us to compile using our gcc with our
- options lists in ${BUILD64} variable.</para>
- </listitem>
- </varlistentry>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/procps.xml"
- xpointer="xpointer(//*[@os='f2'])"/>
-
- <varlistentry os="f3">
- <term><parameter>lib64=lib64</parameter></term>
- <listitem>
- <para>The <filename>Makefile</filename> also attempts to install into
- lib64 on multilib, so again we choose to override it.</para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- </sect2>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(id('contents-procps'))"/>
-
-</sect1>
diff --git a/BOOK/final-system/multilib/procps-n32.xml b/BOOK/final-system/multilib/procps-n32.xml
deleted file mode 100644
index 1772f0a..0000000
--- a/BOOK/final-system/multilib/procps-n32.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-system-procps-n32" role="wrap">
- <?dbhtml filename="procps-n32.html"?>
-
- <title>Procps-&procps-version; N32 Libraries</title>
-
- <indexterm zone="ch-system-procps-n32">
- <primary sortas="a-Procps">Procps</primary>
- <secondary>N32</secondary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of Procps</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='p1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='p3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='p4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='s1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='s2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILDN32}" m64=""</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
-
-<screen os="e"><userinput>make SKIP='/bin/kill /usr/share/man/man1/kill.1' install lib64=lib32</userinput></screen>
-
- <variablelist os="f">
- <title>The meaning of the make and install options:</title>
-
- <varlistentry os="f1">
- <term><parameter>CC="gcc ${BUILDN32}"</parameter></term>
- <listitem>
- <para>This allows us to compile using our gcc with our
- options lists in ${BUILDN32} variable.</para>
- </listitem>
- </varlistentry>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/procps.xml"
- xpointer="xpointer(//*[@os='f2'])"/>
-
- <varlistentry os="f3">
- <term><parameter>lib64=lib32</parameter></term>
- <listitem>
- <para>The <filename>Makefile</filename> also attempts to install into
- lib64 on multilib, so again we choose to override it.</para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- </sect2>
-
- <sect2 role="content">
- <title/>
-
- <para>Details on this package are located in <xref
- linkend="contents-file" role="."/></para>
-
- </sect2>
-
-</sect1>
diff --git a/BOOK/final-system/multilib/procps.xml b/BOOK/final-system/multilib/procps.xml
deleted file mode 100644
index fca111e..0000000
--- a/BOOK/final-system/multilib/procps.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-system-procps-32" role="wrap">
- <?dbhtml filename="procps.html"?>
-
- <title>Procps-&procps-version; 32 Bit Libraries</title>
-
- <indexterm zone="ch-system-procps-32">
- <primary sortas="a-Procps">Procps</primary>
- <secondary>32 Bit</secondary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of Procps</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='p1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='p3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='p4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='s1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='s2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD32}" m64=""</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/procps.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make SKIP='/bin/kill /usr/share/man/man1/kill.1' install lib64=lib</userinput></screen>
-
- <variablelist os="f">
- <title>The meaning of the make and install options:</title>
-
- <varlistentry os="f1">
- <term><parameter>CC="gcc ${BUILD32}"</parameter></term>
- <listitem>
- <para>This allows us to compile using our gcc with our
- options lists in ${BUILD32} variable.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="f2">
- <term><parameter>m64=""</parameter></term>
- <listitem>
- <para>The <filename>Makefile</filename> for this package goes to some
- lengths to build as 64-bit if at all possible. In CLFS we build each
- library for each available ABI. Overriding the m64 option enables us
- ignore this completely.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="f3">
- <term><parameter>lib64=lib</parameter></term>
- <listitem>
- <para>The <filename>Makefile</filename> also attempts to install into
- lib64 on multilib, so again we choose to override it.</para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- </sect2>
-
- <sect2 role="content">
- <title/>
-
- <para>Details on this package are located in <xref
- linkend="contents-procps" role="."/></para>
-
- </sect2>
-
-</sect1>
commit 83f2f46a1fda6d97c92cd083821defecacbaffb3
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:39:40 2014 -0600
Adjust all entries for procps-ng, adjust commands for multilib, and reference ../common/procps-ng.xml when needed.
diff --git a/BOOK/final-system/multilib/procps-ng-64bit.xml b/BOOK/final-system/multilib/procps-ng-64bit.xml
new file mode 100644
index 0000000..86e797f
--- /dev/null
+++ b/BOOK/final-system/multilib/procps-ng-64bit.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-system-procps-ng" role="wrap">
+ <?dbhtml filename="procps-ng-64bit.html"?>
+
+ <title>Procps-ng-&procps-ng-version; 64 Bit</title>
+
+ <indexterm zone="ch-system-procps-ng">
+ <primary sortas="a-Procps-ng">Procps-ng</primary>
+ </indexterm>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@role='package'])"/>
+
+ <sect2 role="installation">
+ <title>Installation of Procps-ng</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --exec-prefix= \
+ --libdir=/usr/lib64 --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
+ --disable-kill</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='f'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../multilib/procps-ng.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
+
+<screen os="k"><userinput>mv -v /usr/bin/pidof /bin
+mv -v /usr/lib64/libprocps.so.* /lib64
+ln -sfv ../../lib64/$(readlink /usr/lib64/libprocps.so) /usr/lib64/libprocps.so</userinput></screen>
+
+ </sect2>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(id('contents-procps-ng'))"/>
+
+</sect1>
diff --git a/BOOK/final-system/multilib/procps-ng-n32.xml b/BOOK/final-system/multilib/procps-ng-n32.xml
new file mode 100644
index 0000000..4f717bd
--- /dev/null
+++ b/BOOK/final-system/multilib/procps-ng-n32.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-system-procps-ng-n32" role="wrap">
+ <?dbhtml filename="procps-ng-n32.html"?>
+
+ <title>Procps-ng-&procps-ng-version; N32 Libraries</title>
+
+ <indexterm zone="ch-system-procps-ng-n32">
+ <primary sortas="a-Procps-ng">Procps-ng</primary>
+ <secondary>N32</secondary>
+ </indexterm>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@role='package'])"/>
+
+ <sect2 role="installation">
+ <title>Installation of Procps-ng</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --exec-prefix= \
+ --libdir=/usr/lib32 --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
+ --disable-kill</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='f'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
+
+<screen os="k"><userinput>mv -v /usr/bin/pidof /bin
+mv -v /usr/lib32/libprocps.so.* /lib32
+ln -sfv ../../lib32/$(readlink /usr/lib32/libprocps.so) /usr/lib32/libprocps.so</userinput></screen>
+
+ </sect2>
+
+ <sect2 role="content">
+ <title/>
+
+ <para>Details on this package are located in <xref
+ linkend="contents-file" role="."/></para>
+
+ </sect2>
+
+</sect1>
diff --git a/BOOK/final-system/multilib/procps-ng.xml b/BOOK/final-system/multilib/procps-ng.xml
new file mode 100644
index 0000000..bc4d7b0
--- /dev/null
+++ b/BOOK/final-system/multilib/procps-ng.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-system-procps-ng-32" role="wrap">
+ <?dbhtml filename="procps-ng.html"?>
+
+ <title>Procps-ng-&procps-ng-version; 32 Bit Libraries</title>
+
+ <indexterm zone="ch-system-procps-ng-32">
+ <primary sortas="a-Procps-ng">Procps-ng</primary>
+ <secondary>32 Bit</secondary>
+ </indexterm>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@role='package'])"/>
+
+ <sect2 role="installation">
+ <title>Installation of Procps-ng</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr --exec-prefix= \
+ --libdir=/usr/lib --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
+ --disable-kill</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='f'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/procps-ng.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
+
+<screen os="k"><userinput>mv -v /usr/bin/pidof /bin
+mv -v /usr/lib/libprocps.so.* /lib
+ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</userinput></screen>
+
+ </sect2>
+
+ <sect2 role="content">
+ <title/>
+
+ <para>Details on this package are located in <xref
+ linkend="contents-procps-ng" role="."/></para>
+
+ </sect2>
+
+</sect1>
commit d228eefe7780f9b32819d426c75cb603b428ebc5
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:38:31 2014 -0600
Rename procps.xml to procps-ng.xml and adjust all entries for procps-ng and all commands for the installation of procps-ng and remove snice and skill for final-system common procps-ng.
diff --git a/BOOK/final-system/common/procps-ng.xml b/BOOK/final-system/common/procps-ng.xml
new file mode 100644
index 0000000..248a84e
--- /dev/null
+++ b/BOOK/final-system/common/procps-ng.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-system-procps-ng" role="wrap">
+ <?dbhtml filename="procps-ng.html"?>
+
+ <title>Procps-ng-&procps-ng-version;</title>
+
+ <indexterm zone="ch-system-procps-ng">
+ <primary sortas="a-Procps-ng">Procps-ng</primary>
+ </indexterm>
+
+ <sect2 role="package">
+ <title/>
+
+ <para>The Procps-ng package contains programs for monitoring
+ processes.</para>
+
+ </sect2>
+
+ <sect2 role="installation">
+ <title>Installation of Procps-ng</title>
+
+ <para os="a">Prepare procps-ng for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr --exec-prefix= \
+ --libdir=/usr/lib --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
+ --disable-kill</userinput></screen>
+
+ <variablelist os="c">
+ <title>The meaning of the configure options:</title>
+ <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 os="d">Compile the package:</para>
+
+<screen os="e"><userinput>make</userinput></screen>
+
+ <para os="f">Remove the test which fails when scripting does not use a tty
+ device. Run the following commands:</para>
+
+<screen os="g"><userinput remap="test">sed -i -r 's|(pmap_initname)\\\$|\1|' testsuite/pmap.test/pmap.exp
+make check</userinput></screen>
+
+ <para os="h">Install the package:</para>
+
+<screen os="i"><userinput>make install</userinput></screen>
+
+ <para os="j">Move essential files to a location that can be found if <filename class="directory">/usr</filename> is not mounted.</para>
+
+<screen os="k"><userinput>mv -v /usr/bin/pidof /bin
+mv -v /usr/lib/libprocps.so.* /lib
+ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</userinput></screen>
+
+ </sect2>
+
+ <sect2 id="contents-procps-ng" role="content">
+ <title>Contents of Procps-ng</title>
+
+ <segmentedlist>
+ <segtitle>Installed programs</segtitle>
+ <segtitle>Installed library</segtitle>
+
+ <seglistitem>
+ <seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop, sysctl, tload,
+ top, uptime, vmstat, w, and watch</seg>
+ <seg>libproc.{a,so}</seg>
+ </seglistitem>
+ </segmentedlist>
+
+ <variablelist>
+ <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+ <?dbfo list-presentation="list"?>
+ <?dbhtml list-presentation="table"?>
+
+ <varlistentry id="free">
+ <term><command>free</command></term>
+ <listitem>
+ <para>Reports the amount of free and used memory (both physical and
+ swap memory) in the system</para>
+ <indexterm zone="ch-system-procps-ng free">
+ <primary sortas="b-free">free</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="pgrep">
+ <term><command>pgrep</command></term>
+ <listitem>
+ <para>Looks up processes based on their name and other attributes</para>
+ <indexterm zone="ch-system-procps-ng pgrep">
+ <primary sortas="b-pgrep">pgrep</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="pidof">
+ <term><command>pidof</command></term>
+ <listitem>
+ <para>Looks up processes based on their name and other attributes</para>
+ <indexterm zone="ch-system-procps-ng pidof">
+ <primary sortas="b-pidof">pidof</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="pkill">
+ <term><command>pkill</command></term>
+ <listitem>
+ <para>Signals processes based on their name and other attributes</para>
+ <indexterm zone="ch-system-procps-ng pkill">
+ <primary sortas="b-pkill">pkill</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="pmap">
+ <term><command>pmap</command></term>
+ <listitem>
+ <para>Reports the memory map of the given process</para>
+ <indexterm zone="ch-system-procps-ng pmap">
+ <primary sortas="b-pmap">pmap</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="ps">
+ <term><command>ps</command></term>
+ <listitem>
+ <para>Lists the current running processes</para>
+ <indexterm zone="ch-system-procps-ng ps">
+ <primary sortas="b-ps">ps</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="pwdx">
+ <term><command>pwdx</command></term>
+ <listitem>
+ <para>Reports the current working directory of a process</para>
+ <indexterm zone="ch-system-procps-ng pwdx">
+ <primary sortas="b-pwdx">pwdx</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="slabtop">
+ <term><command>slabtop</command></term>
+ <listitem>
+ <para>Displays detailed kernel slab cache information in real time</para>
+ <indexterm zone="ch-system-procps-ng slabtop">
+ <primary sortas="b-slabtop">slabtop</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+
+ <varlistentry id="sysctl">
+ <term><command>sysctl</command></term>
+ <listitem>
+ <para>Modifies kernel parameters at run time</para>
+ <indexterm zone="ch-system-procps-ng sysctl">
+ <primary sortas="b-sysctl">sysctl</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="tload">
+ <term><command>tload</command></term>
+ <listitem>
+ <para>Prints a graph of the current system load average</para>
+ <indexterm zone="ch-system-procps-ng tload">
+ <primary sortas="b-tload">tload</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="top">
+ <term><command>top</command></term>
+ <listitem>
+ <para>Displays a list of the most CPU intensive processes; it
+ provides an ongoing look at processor activity in real time</para>
+ <indexterm zone="ch-system-procps-ng top">
+ <primary sortas="b-top">top</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="uptime">
+ <term><command>uptime</command></term>
+ <listitem>
+ <para>Reports how long the system has been running, how many users are
+ logged on, and the system load averages</para>
+ <indexterm zone="ch-system-procps-ng uptime">
+ <primary sortas="b-uptime">uptime</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="vmstat">
+ <term><command>vmstat</command></term>
+ <listitem>
+ <para>Reports virtual memory statistics, giving information about
+ processes, memory, paging, block Input/Output (IO), traps, and CPU
+ activity</para>
+ <indexterm zone="ch-system-procps-ng vmstat">
+ <primary sortas="b-vmstat">vmstat</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="w">
+ <term><command>w</command></term>
+ <listitem>
+ <para>Shows which users are currently logged on, where, and since
+ when</para>
+ <indexterm zone="ch-system-procps-ng w">
+ <primary sortas="b-w">w</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="watch">
+ <term><command>watch</command></term>
+ <listitem>
+ <para>Runs a given command repeatedly, displaying the first
+ screen-full of its output; this allows a user to watch the output
+ change over time</para>
+ <indexterm zone="ch-system-procps-ng watch">
+ <primary sortas="b-watch">watch</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="libproc">
+ <term><filename class="libraryfile">libproc</filename></term>
+ <listitem>
+ <para>Contains the functions used by most programs in this
+ package</para>
+ <indexterm zone="ch-system-procps-ng libproc">
+ <primary sortas="c-libproc">libproc</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+
+ </sect2>
+
+</sect1>
commit d19e0a6f8a07083ff2209a9176b84e1f5c2eb7cd
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:37:22 2014 -0600
The note about sysvinit and a link to pidof is no longer valid anymore.
diff --git a/BOOK/final-system/multilib/psmisc.xml b/BOOK/final-system/multilib/psmisc.xml
index ad08eb1..3e72d78 100644
--- a/BOOK/final-system/multilib/psmisc.xml
+++ b/BOOK/final-system/multilib/psmisc.xml
@@ -60,14 +60,6 @@
href="../common/psmisc.xml"
xpointer="xpointer(//*[@os='j'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/psmisc.xml"
- xpointer="xpointer(//*[@os='k'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/psmisc.xml"
- xpointer="xpointer(//*[@os='l'])"/>
-
</sect2>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
commit 0451a7a23fe4e416eba35a694b91bf576017a327
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:37:00 2014 -0600
The note about sysvinit and and link to pidof is no longer valid.
diff --git a/BOOK/final-system/common/psmisc.xml b/BOOK/final-system/common/psmisc.xml
index 1c3b344..ea583bf 100644
--- a/BOOK/final-system/common/psmisc.xml
+++ b/BOOK/final-system/common/psmisc.xml
@@ -61,14 +61,6 @@
<screen os="j"><userinput>mv -v /bin/pstree* /usr/bin</userinput></screen>
- <para os="k">By default, Psmisc's <command>pidof</command> program is not installed.
- This usually is not a problem because it is installed later in the Sysvinit
- package, which provides a better <command>pidof</command> program. If
- Sysvinit will not be used for a particular system, complete the installation
- of Psmisc by creating the following symlink:</para>
-
-<screen os="l" role="nodump"><userinput>ln -sv killall /bin/pidof</userinput></screen>
-
</sect2>
<sect2 id="contents-psmisc" role="content">
commit 8184788abe4e5b0abe6f341d6f4234f5b55db4b7
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:36:36 2014 -0600
Rename Procps to Procps-ng. This may not be valid anymore. We need to look at the note about ja_JA and fr_IR.
diff --git a/BOOK/final-system/common/eglibc.xml b/BOOK/final-system/common/eglibc.xml
index e8fb6dc..1efa52a 100644
--- a/BOOK/final-system/common/eglibc.xml
+++ b/BOOK/final-system/common/eglibc.xml
@@ -201,7 +201,7 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
support such complex locales at this time. This applies to the ja_JP and
fa_IR locales as well—they have been installed only for GCC and
Gettext tests to pass, and the <command>watch</command> program (part of
- the Procps package) does not work properly in them. Various attempts to
+ the Procps-ng package) does not work properly in them. Various attempts to
circumvent these restrictions are documented in internationalization-related
hints.</para>
commit 7b0fa4abda913f53ac8f8b871e8886cb901d80ad
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:32:11 2014 -0600
Rename all Procps entries to procps-ng.
diff --git a/BOOK/appendices/rationale/common.xml b/BOOK/appendices/rationale/common.xml
index 8af5c6d..7e611c6 100644
--- a/BOOK/appendices/rationale/common.xml
+++ b/BOOK/appendices/rationale/common.xml
@@ -296,7 +296,7 @@
</listitem>
<listitem>
- <para>Procps</para>
+ <para>Procps-ng</para>
<para>Provides a number of small, useful utilities that give information
about the <filename class="directory">/proc</filename> filesystem.</para>
</listitem>
commit 00ef22d79657a995bacf5129f936b08c592502fc
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:31:34 2014 -0600
Rename all procps entries to procps-ng in dependencies.
diff --git a/BOOK/appendices/dependencies/common.xml b/BOOK/appendices/dependencies/common.xml
index 27c218d..9a7b4b2 100644
--- a/BOOK/appendices/dependencies/common.xml
+++ b/BOOK/appendices/dependencies/common.xml
@@ -1325,7 +1325,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>Perl and Procps</seg>
+ <seg>Perl and Procps-ng</seg>
</seglistitem>
</segmentedlist>
@@ -1472,7 +1472,7 @@
<segtitle>&before;</segtitle>
<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>
</seglistitem>
</segmentedlist>
@@ -1520,7 +1520,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>Gzip, Iana-Etc and Procps, Tar</seg>
+ <seg>Gzip, Iana-Etc and Procps-ng, Tar</seg>
</seglistitem>
</segmentedlist>
@@ -1560,8 +1560,8 @@
</seglistitem>
</segmentedlist>
-<!-- Begin Procps dependency info -->
- <bridgehead renderas="sect2" id="procps-dep">Procps</bridgehead>
+<!-- Begin Procps-ng dependency info -->
+ <bridgehead renderas="sect2" id="procps-ng-dep">Procps-ng</bridgehead>
<segmentedlist>
<segtitle>&dependencies;</segtitle>
commit cdc2a3e57c1196b9a2223c523d20bdd654dc45b7
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:30:43 2014 -0600
Update all final-system chapter indeces to reference procps-ng rather than procps.
diff --git a/BOOK/final-system/alpha-chapter.xml b/BOOK/final-system/alpha-chapter.xml
index f8d6804..be1ab11 100644
--- a/BOOK/final-system/alpha-chapter.xml
+++ b/BOOK/final-system/alpha-chapter.xml
@@ -34,7 +34,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/mips-chapter.xml b/BOOK/final-system/mips-chapter.xml
index 7b1290a..d0fce38 100644
--- a/BOOK/final-system/mips-chapter.xml
+++ b/BOOK/final-system/mips-chapter.xml
@@ -34,7 +34,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/mips64-64-chapter.xml b/BOOK/final-system/mips64-64-chapter.xml
index 6667248..9cff086 100644
--- a/BOOK/final-system/mips64-64-chapter.xml
+++ b/BOOK/final-system/mips64-64-chapter.xml
@@ -34,7 +34,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/mips64-chapter.xml b/BOOK/final-system/mips64-chapter.xml
index 2753625..7f61ebb 100644
--- a/BOOK/final-system/mips64-chapter.xml
+++ b/BOOK/final-system/mips64-chapter.xml
@@ -54,9 +54,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-n32.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-64bit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-n32.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
diff --git a/BOOK/final-system/ppc-chapter.xml b/BOOK/final-system/ppc-chapter.xml
index 07a8fcc..bbc32a2 100644
--- a/BOOK/final-system/ppc-chapter.xml
+++ b/BOOK/final-system/ppc-chapter.xml
@@ -34,7 +34,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/ppc64-64-chapter.xml b/BOOK/final-system/ppc64-64-chapter.xml
index 45b024a..3911cf8 100644
--- a/BOOK/final-system/ppc64-64-chapter.xml
+++ b/BOOK/final-system/ppc64-64-chapter.xml
@@ -34,7 +34,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/ppc64-chapter.xml b/BOOK/final-system/ppc64-chapter.xml
index def4f35..f4defae 100644
--- a/BOOK/final-system/ppc64-chapter.xml
+++ b/BOOK/final-system/ppc64-chapter.xml
@@ -45,8 +45,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-64bit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
diff --git a/BOOK/final-system/sparc-chapter.xml b/BOOK/final-system/sparc-chapter.xml
index 19969e4..7b928e3 100644
--- a/BOOK/final-system/sparc-chapter.xml
+++ b/BOOK/final-system/sparc-chapter.xml
@@ -34,7 +34,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/sparc64-64-chapter.xml b/BOOK/final-system/sparc64-64-chapter.xml
index 292926e..e0e141a 100644
--- a/BOOK/final-system/sparc64-64-chapter.xml
+++ b/BOOK/final-system/sparc64-64-chapter.xml
@@ -34,7 +34,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/sparc64-chapter.xml b/BOOK/final-system/sparc64-chapter.xml
index 81c1c63..cb9c8de 100644
--- a/BOOK/final-system/sparc64-chapter.xml
+++ b/BOOK/final-system/sparc64-chapter.xml
@@ -45,8 +45,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-64bit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
diff --git a/BOOK/final-system/x86-chapter.xml b/BOOK/final-system/x86-chapter.xml
index 0c516a3..8b1154a 100644
--- a/BOOK/final-system/x86-chapter.xml
+++ b/BOOK/final-system/x86-chapter.xml
@@ -34,7 +34,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/x86_64-64-chapter.xml b/BOOK/final-system/x86_64-64-chapter.xml
index 22239b2..cdb10e8 100644
--- a/BOOK/final-system/x86_64-64-chapter.xml
+++ b/BOOK/final-system/x86_64-64-chapter.xml
@@ -34,7 +34,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/x86_64-chapter.xml b/BOOK/final-system/x86_64-chapter.xml
index ad927ba..60d3dbe 100644
--- a/BOOK/final-system/x86_64-chapter.xml
+++ b/BOOK/final-system/x86_64-chapter.xml
@@ -45,8 +45,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-64bit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
commit 2700ccd7efd4f5b5fb24752ff4560e237ffd2bad
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:29:58 2014 -0600
Remove offending pidof command entry conflicting with procps-ng pidof install.
diff --git a/BOOK/boot/common/sysvinit.xml b/BOOK/boot/common/sysvinit.xml
index 56bc5a0..aa77cae 100644
--- a/BOOK/boot/common/sysvinit.xml
+++ b/BOOK/boot/common/sysvinit.xml
@@ -127,8 +127,8 @@ EOF</userinput></screen>
<segtitle>Installed programs</segtitle>
<seglistitem>
- <seg>bootlogd, fstab-decode, halt, init, killall5, pidof (link to
- killall5), poweroff (link to halt), reboot (link to halt), runlevel,
+ <seg>bootlogd, fstab-decode, halt, init, killall5,
+ poweroff (link to halt), reboot (link to halt), runlevel,
shutdown, and telinit (link to init)</seg>
</seglistitem>
</segmentedlist>
@@ -196,16 +196,6 @@ EOF</userinput></screen>
</listitem>
</varlistentry>
- <varlistentry id="pidof">
- <term><command>pidof</command></term>
- <listitem>
- <para>Reports the PIDs of the given programs</para>
- <indexterm zone="ch-boot-sysvinit pidof">
- <primary sortas="b-pidof">pidof</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="poweroff">
<term><command>poweroff</command></term>
<listitem>
commit 3e0a2c16d5392793257447440c90cf8cbe9cc6a0
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:28:39 2014 -0600
Add master changelog entry for migration to procps-ng.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 55bf8e8..ff6f1a7 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,15 @@
-->
<listitem>
+ <para>10 January 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Migrate Procps to Procps-ng.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>09 January 2014</para>
<itemizedlist>
<listitem>
commit ebf97379a93541fcc348ad038699546b9bdba97e
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:28:21 2014 -0600
Migrate procps entries to procps-ng.
diff --git a/BOOK/materials/common/packages.xml b/BOOK/materials/common/packages.xml
index 74fae1e..23484e9 100644
--- a/BOOK/materials/common/packages.xml
+++ b/BOOK/materials/common/packages.xml
@@ -501,11 +501,11 @@
</varlistentry>
<varlistentry>
- <term>Procps (&procps-version;) - <token>&procps-size;</token>:</term>
+ <term>Procps-ng (&procps-ng-version;) - <token>&procps-ng-size;</token>:</term>
<listitem>
- <para>Home page: <ulink url="&procps-home;"/></para>
- <para>Download: <ulink url="&procps-url;"/></para>
- <para>MD5 sum: <literal>&procps-md5;</literal></para>
+ <para>Home page: <ulink url="&procps-ng-home;"/></para>
+ <para>Download: <ulink url="&procps-ng-url;"/></para>
+ <para>MD5 sum: <literal>&procps-ng-md5;</literal></para>
</listitem>
</varlistentry>
commit c161fff5be2e4a43ccaa0795bbff2383e92cc4dc
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:28:04 2014 -0600
Remove procps patch entries as they are no longer needed.
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index 4aa0e30..15d65bf 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -138,24 +138,6 @@
</varlistentry>
<varlistentry>
- <term>Procps Fix HZ Errors Patch - <token>&procps-fix_HZ_errors-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&procps-fix_HZ_errors-patch;"/></para>
- <para>MD5 sum: <literal>&procps-fix_HZ_errors-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <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>
<para>Download: <ulink
commit 413f061597b4f14376b80db00206364426d83077
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:27:45 2014 -0600
Migrate all procps entries to procps-ng and update size, version, home, md5, and url entities.
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index f333ac6..26fdac9 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -389,11 +389,11 @@
<!ENTITY powerpcutils-md5 "d879b109bb8f0d726304b60b147bff13">
<!ENTITY powerpcutils-home "http://packages.qa.debian.org/p/powerpc-utils.html">
-<!ENTITY procps-version "3.2.8">
-<!ENTITY procps-size "280 KB">
-<!ENTITY procps-url "http://procps.sourceforge.net/procps-&procps-version;.tar.gz">
-<!ENTITY procps-md5 "9532714b6846013ca9898984ba4cd7e0">
-<!ENTITY procps-home "http://procps.sourceforge.net">
+<!ENTITY procps-ng-version "3.3.9">
+<!ENTITY procps-ng-size "548 KB">
+<!ENTITY procps-ng-url "http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
+<!ENTITY procps-ng-md5 "0980646fa25e0be58f7afb6b98f79d74">
+<!ENTITY procps-ng-home "http://sourceforge.net/projects/procps-ng">
<!ENTITY psmisc-version "22.20">
<!ENTITY psmisc-size "428 KB">
commit 34f15293c1bba9a4d85833fd374df70bb2461841
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:27:17 2014 -0600
Remove procps patches as they are no longer needed.
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 2f78038..b689cd8 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -64,14 +64,6 @@
<!ENTITY perl-libc-patch-md5 "0959d8c1d370ce152b0d2a6df5ccfd7e">
<!ENTITY perl-libc-patch-size "1.657 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 "3.1 KB">
-
-<!ENTITY procps-fix_HZ_errors-patch "procps-&procps-version;-fix_HZ_errors-1.patch">
-<!ENTITY procps-fix_HZ_errors-patch-md5 "2ea4c8e9a2c2a5a291ec63c92d7c6e3b">
-<!ENTITY procps-fix_HZ_errors-patch-size "2.4 KB">
-
<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-3.patch">
<!ENTITY readline-branch_update-patch-md5 "af788f5b1cfc5db9efc9e0fa0268a574">
<!ENTITY readline-branch_update-patch-size "4.9 KB">
commit 7389805ffdc22a441f7210dafc193eb229373e2f
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 10 13:27:05 2014 -0600
Update date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 85029df..8f79bd2 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "01"> <!-- Use two digits -->
<!ENTITY month_name "January">
-<!ENTITY day "08"> <!-- Use two digits -->
+<!ENTITY day "10"> <!-- Use two digits -->
<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/appendices/dependencies/common.xml | 10 +-
BOOK/appendices/rationale/common.xml | 2 +-
BOOK/boot/common/sysvinit.xml | 14 +--
BOOK/final-system/alpha-chapter.xml | 2 +-
BOOK/final-system/common/eglibc.xml | 2 +-
.../common/{procps.xml => procps-ng.xml} | 123 ++++++++++----------
BOOK/final-system/common/psmisc.xml | 8 --
BOOK/final-system/mips-chapter.xml | 2 +-
BOOK/final-system/mips64-64-chapter.xml | 2 +-
BOOK/final-system/mips64-chapter.xml | 6 +-
BOOK/final-system/multilib/procps-64bit.xml | 95 ---------------
BOOK/final-system/multilib/procps-n32.xml | 101 ----------------
.../multilib/{sed.xml => procps-ng-64bit.xml} | 51 ++++-----
.../multilib/{isl-n32.xml => procps-ng-n32.xml} | 46 ++++----
.../multilib/{isl.xml => procps-ng.xml} | 48 ++++----
BOOK/final-system/multilib/procps.xml | 106 -----------------
BOOK/final-system/multilib/psmisc.xml | 8 --
BOOK/final-system/ppc-chapter.xml | 2 +-
BOOK/final-system/ppc64-64-chapter.xml | 2 +-
BOOK/final-system/ppc64-chapter.xml | 4 +-
BOOK/final-system/sparc-chapter.xml | 2 +-
BOOK/final-system/sparc64-64-chapter.xml | 2 +-
BOOK/final-system/sparc64-chapter.xml | 4 +-
BOOK/final-system/x86-chapter.xml | 2 +-
BOOK/final-system/x86_64-64-chapter.xml | 2 +-
BOOK/final-system/x86_64-chapter.xml | 4 +-
BOOK/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 9 ++
BOOK/materials/common/packages.xml | 8 +-
BOOK/materials/common/patches.xml | 18 ---
BOOK/packages.ent | 10 +-
BOOK/patches.ent | 8 --
patches/procps-3.2.8-fix_HZ_errors-1.patch | 54 ---------
patches/procps-3.2.8-ps_cgroup-1.patch | 81 -------------
34 files changed, 181 insertions(+), 659 deletions(-)
rename BOOK/final-system/common/{procps.xml => procps-ng.xml} (65%)
delete mode 100644 BOOK/final-system/multilib/procps-64bit.xml
delete mode 100644 BOOK/final-system/multilib/procps-n32.xml
copy BOOK/final-system/multilib/{sed.xml => procps-ng-64bit.xml} (57%)
copy BOOK/final-system/multilib/{isl-n32.xml => procps-ng-n32.xml} (57%)
copy BOOK/final-system/multilib/{isl.xml => procps-ng.xml} (57%)
delete mode 100644 BOOK/final-system/multilib/procps.xml
delete mode 100644 patches/procps-3.2.8-fix_HZ_errors-1.patch
delete mode 100644 patches/procps-3.2.8-ps_cgroup-1.patch
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list