Browse Source

- procps-ns: back to 3.3.17 for coolstream because of missing xlocale

master
vanhofen 2 years ago
parent
commit
536c1a8fc7
  1. 13
      package/procps-ng/patches/0001-fix-watch-build.patch
  2. 13
      package/procps-ng/patches/0002-change-sysctl-d-locations.patch
  3. 9
      package/procps-ng/procps-ng.mk

13
package/procps-ng/patches/0001-fix-watch-build.patch

@ -1,13 +0,0 @@
diff --git a/watch.c b/watch.c
index 0ba6b3f..96f525b 100644
--- a/watch.c
+++ b/watch.c
@@ -52,7 +52,7 @@
# define _XOPEN_SOURCE_EXTENDED 1
# include <wchar.h>
# include <wctype.h>
-# include <ncursesw/ncurses.h>
+# include <ncurses.h>
#else
# include <ncurses.h>
#endif /* WITH_WATCH8BIT */

13
package/procps-ng/patches/0002-change-sysctl-d-locations.patch

@ -1,13 +0,0 @@
diff --git a/sysctl.c b/sysctl.c
index bbca0b9..90d594d 100644
--- a/sysctl.c
+++ b/sysctl.c
@@ -624,7 +624,7 @@ static int PreloadSystem(void)
const char *dirs[] = {
"/etc/sysctl.d",
"/run/sysctl.d",
- "/usr/local/lib/sysctl.d",
+ "/var/etc/sysctl.d",
"/usr/lib/sysctl.d",
"/lib/sysctl.d",
};

9
package/procps-ng/procps-ng.mk

@ -4,8 +4,12 @@
# #
################################################################################ ################################################################################
PROCPS_NG_VERSION = 4.0.0 PROCPS_NG_VERSION = $(if $(filter $(BOXTYPE),coolstream),3.3.17,4.0.0)
PROCPS_NG_DIR = procps-ng-$(PROCPS_NG_VERSION) ifeq ($(BOXTYPE),coolstream)
PROCPS_NG_DIR = procps-$(PROCPS_NG_VERSION)
else
PROCPS_NG_DIR = procps-ng-$(PROCPS_NG_VERSION))
endif
PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz
PROCPS_NG_SITE = http://sourceforge.net/projects/procps-ng/files/Production PROCPS_NG_SITE = http://sourceforge.net/projects/procps-ng/files/Production
@ -24,6 +28,7 @@ PROCPS_NG_CONF_OPTS = \
--libdir=$(libdir) \ --libdir=$(libdir) \
--bindir=$(base_bindir).$(@F) \ --bindir=$(base_bindir).$(@F) \
--docdir=$(REMOVE_docdir) \ --docdir=$(REMOVE_docdir) \
--disable-numa \
--without-systemd --without-systemd
# Allows unicode characters to show in 'watch' # Allows unicode characters to show in 'watch'

Loading…
Cancel
Save