diff options
| -rw-r--r-- | chapter01/changelog.xml | 9 | ||||
| -rw-r--r-- | chapter06/procps.xml | 6 | ||||
| -rw-r--r-- | packages.ent | 6 |
3 files changed, 16 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 466a9d714..ab03a749f 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,15 @@ <para>2012-09-27</para> <itemizedlist> <listitem> + <para>[bdubbs] - Change procps to not install the + kill program that is now installed by util-linux. Fixes + <ulink url="&lfs-ticket-root;3201">#3201</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to util-linux-2.22.1. Fixes + <ulink url="&lfs-ticket-root;3199">#3199</ulink>.</para> + </listitem> + <listitem> <para>[bdubbs] - Update to linux-3.6.2. Fixes <ulink url="&lfs-ticket-root;3198">#3198</ulink>.</para> </listitem> diff --git a/chapter06/procps.xml b/chapter06/procps.xml index 6fe443fd4..ea26619d1 100644 --- a/chapter06/procps.xml +++ b/chapter06/procps.xml @@ -50,10 +50,12 @@ <screen><userinput remap="pre">patch -Np1 -i ../&procps-watch-patch;</userinput></screen> - <para>Fix a bug in the Makefile, which prevents procps from building with + <para>Do not install the kill program because it was installed by util-linux. + Also fix a bug in the Makefile, which prevents procps from building with make-&make-version;:</para> -<screen><userinput remap="pre">sed -i -e 's@\*/module.mk@proc/module.mk ps/module.mk@' Makefile</userinput></screen> +<screen><userinput remap="pre">sed -i -e 's@\*/module.mk@proc/module.mk ps/module.mk@' \ + -e 's@^#SKIP/SKIP/' Makefile</userinput></screen> <para>Compile the package:</para> diff --git a/packages.ent b/packages.ent index ea3f1e668..511a4eea6 100644 --- a/packages.ent +++ b/packages.ent @@ -546,10 +546,10 @@ <!ENTITY udev-lfs-md5 "3bd58f59ed73a08a7d427ee1fccc91ef"> <!ENTITY udev-lfs-home " "> -<!ENTITY util-linux-version "2.22"> -<!ENTITY util-linux-size "3,116 KB"> +<!ENTITY util-linux-version "2.22.1"> +<!ENTITY util-linux-size "3,124 KB"> <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.22/util-linux-&util-linux-version;.tar.xz"> -<!ENTITY util-linux-md5 "ba2d8cc12a937231c80a04f7f7149303"> +<!ENTITY util-linux-md5 "730cf9932531ed09b53a04ca30fcb4c9"> <!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/"> <!ENTITY util-linux-ch6-du "83 MB"> <!ENTITY util-linux-ch6-sbu "0.7 SBU"> |