Commit 5cd1c4fe authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

package/procps: bump version and rename to procps-ng



procps is getting replaced by procps-ng, and there are
new versions available!

procps-ng is now an autotools package, so get rid of our
custom build/install rules.

Remove most patches, except for one that still half-applies,
so update and rename it.

procps is dead, long live procps-ng!

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 7de0d049
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -98,6 +98,16 @@ comment "build, or run, in unpredictable ways. "
comment "----------------------------------------------------"
endif

###############################################################################
comment "Legacy options removed in 2014.08"

config BR2_PACKAGE_PROCPS
	bool "procps has been replaced by procps-ng"
	select BR2_PACKAGE_PROCPS_NG
	select BR2_LEGACY
	help
	  The procps package has been replaced by the equivalent procps-ng.

###############################################################################
comment "Legacy options removed in 2014.05"

+1 −1
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ source "package/numactl/Config.in"
source "package/nut/Config.in"
source "package/polkit/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/procps/Config.in"
source "package/procps-ng/Config.in"
source "package/psmisc/Config.in"
endif
source "package/quota/Config.in"
+3 −3
Original line number Diff line number Diff line
config BR2_PACKAGE_PROCPS
	bool "procps"
config BR2_PACKAGE_PROCPS_NG
	bool "procps-ng"
	select BR2_PACKAGE_NCURSES
	help
	  Standard informational utilities and process-handling tools.
	  Provides things like kill, ps, uptime, free, top, etc...

	  http://procps.sourceforge.net/
	  http://sourceforge.net/projects/procps-ng/
+16 −0
Original line number Diff line number Diff line
sysctl: remove use of legacy index()

[yann.morin.1998@free.fr: adapt to procps-ng]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff -durN procps-v3.3.9.orig/sysctl.c procps-v3.3.9/sysctl.c
--- procps-v3.3.9.orig/sysctl.c	2013-12-03 12:16:18.000000000 +0100
+++ procps-v3.3.9/sysctl.c	2014-05-31 00:45:00.869748741 +0200
@@ -794,7 +794,7 @@
 		      program_invocation_short_name);
 
 	for ( ; *argv; argv++) {
-		if (WriteMode || index(*argv, '='))
+		if (WriteMode || strchr(*argv, '='))
 			ReturnCode += WriteSetting(*argv);
 		else
 			ReturnCode += ReadSetting(*argv);
+15 −0
Original line number Diff line number Diff line
################################################################################
#
# procps
#
################################################################################

PROCPS_NG_VERSION = 3.3.9
PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz
PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production
PROCPS_NG_LICENSE = GPLv2+, libproc and libps LGPLv2+
PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB

PROCPS_NG_DEPENDENCIES = ncurses

$(eval $(autotools-package))
Loading