diff options
| -rw-r--r-- | chapter01/changelog.xml | 15 | ||||
| -rw-r--r-- | chapter03/patches.xml | 21 | ||||
| -rw-r--r-- | chapter06/kmod.xml | 2 | ||||
| -rw-r--r-- | chapter06/procps.xml | 31 | ||||
| -rw-r--r-- | chapter06/sysvinit.xml | 20 | ||||
| -rw-r--r-- | chapter06/xz.xml | 4 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | packages.ent | 6 | ||||
| -rw-r--r-- | patches.ent | 4 |
9 files changed, 68 insertions, 39 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index abdd758cf..57ff3695e 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,21 @@ </listitem> --> <listitem> + <para>2013-12-13</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Update to procps-ng-3.3.9. Fixes + <ulink url="&lfs-ticket-root;3439">#3439</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Install non-essential programs from + the xz package in /usr/bin. Fixes + <ulink url="&lfs-ticket-root;3445">#3445</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2013-12-07</para> <itemizedlist> <listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 69abd9853..05532f965 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -67,20 +67,29 @@ </varlistentry> <varlistentry> - <term>Tar Manpage Patch - <token>&tar-manpage-patch-size;</token>:</term> + <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term> <listitem> - <para>Download: <ulink url="&patches-root;&tar-manpage-patch;"/></para> - <para>MD5 sum: <literal>&tar-manpage-patch-md5;</literal></para> + <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para> + <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para> </listitem> </varlistentry> <varlistentry> - <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term> + <term>Sysvinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</token>:</term> <listitem> - <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para> - <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para> + <para>Download: <ulink url="&patches-root;&sysvinit-consolidated-patch;"/></para> + <para>MD5 sum: <literal>&sysvinit-consolidated-patch-md5;</literal></para> </listitem> </varlistentry> + + <varlistentry> + <term>Tar Manpage Patch - <token>&tar-manpage-patch-size;</token>:</term> + <listitem> + <para>Download: <ulink url="&patches-root;&tar-manpage-patch;"/></para> + <para>MD5 sum: <literal>&tar-manpage-patch-md5;</literal></para> + </listitem> + </varlistentry> + <!-- <varlistentry> <term>Texinfo Test Patch - <token>&texinfo-test-patch-size;</token>:</term> 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,20 +47,12 @@ --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> <para>This switch disables building the kill command that @@ -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> diff --git a/general.ent b/general.ent index f0b79240a..a02835661 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20131207"> -<!ENTITY releasedate "December 7, 2013"> +<!ENTITY version "SVN-20131213"> +<!ENTITY releasedate "December 13, 2013"> <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.5"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/packages.ent b/packages.ent index 652a3e7ec..c883e711c 100644 --- a/packages.ent +++ b/packages.ent @@ -451,10 +451,10 @@ <!ENTITY pkgconfig-ch6-du "31 MB"> <!ENTITY pkgconfig-ch6-sbu "0.4 SBU"> -<!ENTITY procps-ng-version "3.3.8"> -<!ENTITY procps-ng-size "544 KB"> +<!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 "aecbeeda2ab308f8d09dddcb4cb9a572"> +<!ENTITY procps-ng-md5 "0980646fa25e0be58f7afb6b98f79d74"> <!ENTITY procps-ng-home "http://sourceforge.net/projects/procps-ng"> <!ENTITY procps-ng-ch6-du "13 MB"> <!ENTITY procps-ng-ch6-sbu "0.2 SBU"> diff --git a/patches.ent b/patches.ent index 4d9245105..b59565a11 100644 --- a/patches.ent +++ b/patches.ent @@ -30,6 +30,10 @@ <!ENTITY readline-fixes-patch-md5 "3c185f7b76001d3d0af614f6f2cd5dfa"> <!ENTITY readline-fixes-patch-size "1.3 KB"> +<!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch"> +<!ENTITY sysvinit-consolidated-patch-md5 "0b7b5ea568a878fdcc4057b2bf36e5cb"> +<!ENTITY sysvinit-consolidated-patch-size "3.9 KB"> + <!ENTITY tar-manpage-patch "tar-&tar-version;-manpage-1.patch"> <!ENTITY tar-manpage-patch-md5 "321f85ec32733b1a9399e788714a5156"> <!ENTITY tar-manpage-patch-size "7.8 KB"> |