From 3383a53e90674b72f4202a647cae5aac0b32f741 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 14 Oct 2012 05:48:05 +0000 Subject: [PATCH] Change procps to not install the kill program that is now installed by util-linux. Update to util-linux-2.22.1. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10019 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 9 +++++++++ chapter06/procps.xml | 6 ++++-- 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 @@ -39,6 +39,15 @@ 2012-09-27 + + [bdubbs] - Change procps to not install the + kill program that is now installed by util-linux. Fixes + #3201. + + + [bdubbs] - Update to util-linux-2.22.1. Fixes + #3199. + [bdubbs] - Update to linux-3.6.2. Fixes #3198. 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 @@ patch -Np1 -i ../&procps-watch-patch; - Fix a bug in the Makefile, which prevents procps from building with + 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;: -sed -i -e 's@\*/module.mk@proc/module.mk ps/module.mk@' Makefile +sed -i -e 's@\*/module.mk@proc/module.mk ps/module.mk@' \ + -e 's@^#SKIP/SKIP/' Makefile Compile the package: diff --git a/packages.ent b/packages.ent index ea3f1e668..511a4eea6 100644 --- a/packages.ent +++ b/packages.ent @@ -546,10 +546,10 @@ - - + + - +