From 9132fe499be0b137bc5494d39cb89390ea11f4ca Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Fri, 13 Dec 2013 06:55:02 +0000
Subject: Update to procps-ng-3.3.9 Install non-essential programs from the xz
 package in /usr/bin.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10390 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/kmod.xml     |  2 +-
 chapter06/procps.xml   | 31 ++++++++++++++++++-------------
 chapter06/sysvinit.xml | 20 ++++++++------------
 chapter06/xz.xml       |  4 ++--
 4 files changed, 29 insertions(+), 28 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml
index 9c06ef64f..f87024868 100644
--- a/chapter06/kmod.xml
+++ b/chapter06/kmod.xml
@@ -95,7 +95,7 @@ ln -sv kmod /bin/lsmod</userinput></screen>
     <para> Make sure that all libraries are in the correct directory: </para>
 
 <screen><userinput remap="install">mv -v /usr/lib/libkmod.so.* /lib
-ln -svf ../../lib/libkmod.so.2.2.4 /usr/lib/libkmod.so</userinput></screen>
+ln -svf ../../lib/libkmod.so.2.2.5 /usr/lib/libkmod.so</userinput></screen>
 
 <!-- Note to editors:  When upgrading kmod, make sure the library version
      specified above has not changed -->
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 5309bb796..2deebf10d 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -47,19 +47,11 @@
             --libdir=/usr/lib                       \
             --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
             --disable-static                        \
-            --disable-skill                         \
             --disable-kill</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
 
-      <varlistentry>
-        <term><parameter>--disable-skill</parameter></term>
-        <listitem>
-          <para>This switch disables the obsolete and unportable
-          skill and snice commands.</para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
         <term><parameter>--disable-kill</parameter></term>
         <listitem>
@@ -85,11 +77,14 @@ make check</userinput></screen>
 
 <screen><userinput remap="install">make install</userinput></screen>
 
-<para>Finally, move the library to a location that can be found if
+<para>Finally, move essential files to a location that can be found if
 <filename class="directory">/usr</filename> is not mounted.</para>
 
-<screen><userinput remap="install">mv -v /usr/lib/libprocps.so.* /lib
-ln -sfv ../../lib/libprocps.so.1.1.2 /usr/lib/libprocps.so</userinput></screen>
+<screen><userinput remap="install">mv -v /usr/bin/pidof /bin
+mv -v /usr/lib/libprocps.so.* /lib
+ln -sfv ../../lib/libprocps.so.3.0.0 /usr/lib/libprocps.so</userinput></screen>
+
+<!-- Note to devs: check the library version for new releases -->
 
   </sect2>
 
@@ -101,7 +96,7 @@ ln -sfv ../../lib/libprocps.so.1.1.2 /usr/lib/libprocps.so</userinput></screen>
       <segtitle>Installed library</segtitle>
 
       <seglistitem>
-        <seg>free, pgrep, pkill, pmap, ps, pwdx, slabtop,
+        <seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop,
         sysctl, tload, top, uptime, vmstat, w, and, watch</seg>
         <seg>libprocps.so</seg>
       </seglistitem>
@@ -133,6 +128,16 @@ ln -sfv ../../lib/libprocps.so.1.1.2 /usr/lib/libprocps.so</userinput></screen>
         </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 pidof">
+            <primary sortas="b-pidof">pidof</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="pkill">
         <term><command>pkill</command></term>
         <listitem>
@@ -261,7 +266,7 @@ ln -sfv ../../lib/libprocps.so.1.1.2 /usr/lib/libprocps.so</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libprocps">
-        <term><filename class="libraryfile">libproc</filename></term>
+        <term><filename class="libraryfile">libprocps</filename></term>
         <listitem>
           <para>Contains the functions used by most programs in this
           package</para>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 548616b84..b1fac46db 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -41,6 +41,7 @@
   <sect2 role="installation">
     <title>Installation of Sysvinit</title>
 
+<!--
     <para>When run-levels are changed (for example, when halting the
     system), <command>init</command> sends termination signals to those
     processes that <command>init</command> itself started and that should
@@ -65,6 +66,11 @@
         -e '/mountpoint/d' \
         -e '/mesg/d'       \
         -e 's/= sulogin(\.8)?/=/' src/Makefile</userinput></screen>
+-->
+    <para>First, apply a patch that removes several programs installed by other
+    packages, clarifies a message, and fixes a compiler warning:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&sysvinit-consolidated-patch;</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -85,8 +91,8 @@
       <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>
@@ -154,16 +160,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="pidof">
-        <term><command>pidof</command></term>
-        <listitem>
-          <para>Reports the PIDs of the given programs</para>
-          <indexterm zone="ch-system-sysvinit pidof">
-            <primary sortas="b-pidof">pidof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="poweroff">
         <term><command>poweroff</command></term>
         <listitem>
diff --git a/chapter06/xz.xml b/chapter06/xz.xml
index a44bd10cd..65420b81c 100644
--- a/chapter06/xz.xml
+++ b/chapter06/xz.xml
@@ -47,7 +47,6 @@
     <para>Prepare Xz for compilation with:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr \
-            --bindir=/bin \
             --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <para>Compile the package:</para>
@@ -58,10 +57,11 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-  <para>Install the package and make sure that all libraries are in the
+  <para>Install the package and make sure that all essential files are in the
   correct directory:</para>
 
 <screen><userinput remap="install">make install
+mv -v   /usr/bin/{unlzma,unxz,xzcat,lzma,xz} /bin
 mv -v /usr/lib/liblzma.so.* /lib
 ln -svf ../../lib/liblzma.so.&xz-version; /usr/lib/liblzma.so</userinput></screen>
 
-- 
cgit v1.2.3-54-g00ecf