[procps] sysctl.conf and FAQ fixes
- From: Sami Kerola <kerolasa@xxxxxx>
- To: procps-ng <procps@xxxxxxxxxxxxx>
- Date: Sun, 29 Apr 2012 17:45:26 +0200
Hi Craig et.al.
I notice Archlinux offered me procps-ng upgrade, so I took a look what
was going on. It seems that distribution package maintainers need an
option to disable example /etc/sysctl.conf file. I suspect that is
something most distributions want so installing upstream example file
as is is probably exception. First patch should help packagers in
that. The second patch fixes naming mismatch, and is as trivial as an
patch can be.
--
Sami Kerola
http://www.iki.fi/kerolasa/
From 3a20b7828727032d787ad611f8fbcc1d62fb3a7d Mon Sep 17 00:00:00 2001
From: Sami Kerola <kerolasa@xxxxxx>
Date: Sun, 29 Apr 2012 17:22:29 +0200
Subject: [PATCH 1/2] build-sys: allow packagers to choose what is installed
Distribution maintainers may not want to use upstream example files
in their procps-ng package.
Reference: http://permalink.gmane.org/gmane.linux.arch.devel/17440
Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
Makefile.am | 2 ++
configure.ac | 6 ++++++
2 files changed, 8 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 87b88ec..ec2f12a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,9 @@ uptime_SOURCES = uptime.c $(top_srcdir)/lib/fileutils.c
vmstat_SOURCES = vmstat.c $(top_srcdir)/lib/strutils.c
$(top_srcdir)/lib/fileutils.c
w_SOURCES = w.c $(top_srcdir)/lib/fileutils.c
+if EXAMPLE_FILES
sysconf_DATA = sysctl.conf
+endif
EXTRA_DIST = \
autogen.sh \
diff --git a/configure.ac b/configure.ac
index a493fa8..e3f701b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,6 +187,12 @@ AC_ARG_ENABLE([skill],
)
AM_CONDITIONAL(BUILD_SKILL, test "x$build_skill" = xyes)
+AC_ARG_ENABLE([examples],
+ AS_HELP_STRING([--enable-examples], [add example files to installation]),
+ [], enable_examples=no
+)
+AM_CONDITIONAL(EXAMPLE_FILES, test "x$enable_examples" = xyes)
+
AC_ARG_ENABLE([oomem],
AS_HELP_STRING([--enable-oomem], [add out-of-memory fields to the library
and top]),
[], enable_oomem=no
--
1.7.10
From c4d281c06e930f382c551566266f8cc0e9801c0b Mon Sep 17 00:00:00 2001
From: Sami Kerola <kerolasa@xxxxxx>
Date: Sun, 29 Apr 2012 17:34:54 +0200
Subject: [PATCH 2/2] docs: correct libprocps name in FAQ
Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
Documentation/FAQ | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/FAQ b/Documentation/FAQ
index dc6a079..7d815e8 100644
--- a/Documentation/FAQ
+++ b/Documentation/FAQ
@@ -79,7 +79,7 @@ Why are there so many procps projects?
represents the Debian, Fedora and openSUSE fork of procps. To avoid
confusion and potential name clashes the package is now known as
procps-ng (next generation), the version number was raised to 3.3.0
- and the library soname changed to libproc-ng-3.3.0.
+ and the library so-name changed to libprocps.so
What is being done to procps-ng at its new home?
--
1.7.10
Other related posts:
