Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,16 @@
|
||||
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);
|
||||
@@ -0,0 +1,57 @@
|
||||
Don't assume ncursesw headers are in ../usr/include/ncursesw/..
|
||||
On a pure build/system without legacy ncurses that may not be true.
|
||||
Since we're using pkg-config let it provide the correct include path.
|
||||
|
||||
Status: contacted one of the maintainers on sf.net
|
||||
(ticket submission closed to the public, no other way of contacting them).
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
[Bernd: Rebased for version 3.3.11]
|
||||
|
||||
diff -Nura procps-ng-3.3.10.orig/configure.ac procps-ng-3.3.10/configure.ac
|
||||
--- procps-ng-3.3.10.orig/configure.ac 2015-04-07 19:21:55.729819952 -0300
|
||||
+++ procps-ng-3.3.10/configure.ac 2015-04-07 19:32:09.511706653 -0300
|
||||
@@ -138,7 +138,8 @@
|
||||
])
|
||||
AM_CONDITIONAL(WITH_NCURSES, true)
|
||||
if test "$enable_watch8bit" = yes; then
|
||||
- PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"], [
|
||||
+ PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"]
|
||||
+ [WATCH_NCURSES_CFLAGS="$NCURSESW_CFLAGS"], [
|
||||
AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
|
||||
[AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
|
||||
])
|
||||
@@ -148,6 +149,7 @@
|
||||
fi
|
||||
AC_SUBST([NCURSES_LIBS])
|
||||
AC_SUBST([WATCH_NCURSES_LIBS])
|
||||
+AC_SUBST([WATCH_NCURSES_CFLAGS])
|
||||
|
||||
AC_ARG_WITH([systemd],
|
||||
[AS_HELP_STRING([--with-systemd], [enable systemd support])],
|
||||
diff -Nura procps-ng-3.3.10.orig/Makefile.am procps-ng-3.3.10/Makefile.am
|
||||
--- procps-ng-3.3.10.orig/Makefile.am 2015-04-07 19:21:55.655817434 -0300
|
||||
+++ procps-ng-3.3.10/Makefile.am 2015-04-07 19:32:54.516238136 -0300
|
||||
@@ -97,6 +97,7 @@
|
||||
slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
|
||||
watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
|
||||
watch_LDADD = $(LDADD) @WATCH_NCURSES_LIBS@
|
||||
+watch_CFLAGS = @WATCH_NCURSES_CFLAGS@
|
||||
top_top_SOURCES = \
|
||||
top/top.h \
|
||||
top/top.c \
|
||||
diff -Nura procps-ng-3.3.10.orig/watch.c procps-ng-3.3.10/watch.c
|
||||
--- procps-ng-3.3.10.orig/watch.c 2015-04-07 19:21:55.707819203 -0300
|
||||
+++ procps-ng-3.3.10/watch.c 2015-04-07 19:22:27.323895083 -0300
|
||||
@@ -51,10 +51,8 @@
|
||||
#ifdef WITH_WATCH8BIT
|
||||
# include <wchar.h>
|
||||
# include <wctype.h>
|
||||
-# include <ncursesw/ncurses.h>
|
||||
-#else
|
||||
-# include <ncurses.h>
|
||||
#endif /* WITH_WATCH8BIT */
|
||||
+#include <ncurses.h>
|
||||
|
||||
#ifdef FORCE_8BIT
|
||||
# undef isprint
|
||||
10
deprecated/firmware/buildroot/package/procps-ng/Config.in
Normal file
10
deprecated/firmware/buildroot/package/procps-ng/Config.in
Normal file
@@ -0,0 +1,10 @@
|
||||
config BR2_PACKAGE_PROCPS_NG
|
||||
bool "procps-ng"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||
help
|
||||
Standard informational utilities and process-handling tools.
|
||||
Provides things like kill, ps, uptime, free, top, etc...
|
||||
|
||||
http://sourceforge.net/projects/procps-ng/
|
||||
@@ -0,0 +1,3 @@
|
||||
# From http://sourceforge.net/projects/procps-ng/files/Production/
|
||||
md5 6cc5b94c1c5b8cbc89ad345a7b522f74 procps-ng-3.3.11.tar.xz
|
||||
sha1 1bdca65547df9ed019bd83649b0f8b8eaa017e25 procps-ng-3.3.11.tar.xz
|
||||
46
deprecated/firmware/buildroot/package/procps-ng/procps-ng.mk
Normal file
46
deprecated/firmware/buildroot/package/procps-ng/procps-ng.mk
Normal file
@@ -0,0 +1,46 @@
|
||||
################################################################################
|
||||
#
|
||||
# procps-ng
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PROCPS_NG_VERSION = 3.3.11
|
||||
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_INSTALL_STAGING = YES
|
||||
PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf
|
||||
# For 0002-use-pkgconfig-for-ncursesw-cflags.patch
|
||||
PROCPS_NG_AUTORECONF = YES
|
||||
PROCPS_NG_GETTEXTIZE = YES
|
||||
|
||||
# If both procps-ng and busybox are selected, make certain procps-ng
|
||||
# wins the fight over who gets to have their utils actually installed.
|
||||
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
PROCPS_NG_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
|
||||
PROCPS_NG_DEPENDENCIES += gettext
|
||||
PROCPS_NG_CONF_OPTS += LIBS=-lintl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
PROCPS_NG_DEPENDENCIES += systemd
|
||||
PROCPS_NG_CONF_OPTS += --with-systemd
|
||||
else
|
||||
PROCPS_NG_CONF_OPTS += --without-systemd
|
||||
endif
|
||||
|
||||
# Make sure binaries get installed in /bin, so that they overwrite
|
||||
# their busybox counterparts.
|
||||
PROCPS_NG_CONF_OPTS += --exec-prefix=/
|
||||
|
||||
# Allows unicode characters to show in 'watch'
|
||||
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
|
||||
PROCPS_NG_CONF_OPTS += \
|
||||
--enable-watch8bit
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user