Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,33 @@
|
||||
Link against libintl if needed
|
||||
|
||||
When built against a C library that has locale support, but for which
|
||||
intl support is provided by an external libintl library, psmisc
|
||||
forgets to link against this library, even though the configure script
|
||||
properly checks that.
|
||||
|
||||
This patch therefore ensure that we link against libintl when needed,
|
||||
thanks to the @INTLLIBS@ variable provided by the configure script.
|
||||
|
||||
We do not modify the Makefile.am file, because autoreconfiguring this
|
||||
package doesn't work: because of its usage of gettext, it wants to run
|
||||
the "autopoint" program, which itself depends on CVS being installed,
|
||||
for some strange reasons. That's the reason why we fall back to the
|
||||
hacky solution of modifying the Makefile.in file.
|
||||
|
||||
Forward-ported Thomas's patch to psmisc 22.16
|
||||
from commit f066ed70cd6939838d4057f66798cbc1d972cc73
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
diff -Nura psmisc-22.16.orig/src/Makefile.in psmisc-22.16/src/Makefile.in
|
||||
--- psmisc-22.16.orig/src/Makefile.in 2012-03-28 22:27:33.106660358 -0300
|
||||
+++ psmisc-22.16/src/Makefile.in 2012-03-28 22:28:55.752219349 -0300
|
||||
@@ -76,7 +76,7 @@
|
||||
killall_DEPENDENCIES =
|
||||
am_peekfd_OBJECTS = peekfd.$(OBJEXT)
|
||||
peekfd_OBJECTS = $(am_peekfd_OBJECTS)
|
||||
-peekfd_LDADD = $(LDADD)
|
||||
+peekfd_LDADD = $(LDADD) @LIBINTL@
|
||||
am_prtstat_OBJECTS = prtstat.$(OBJEXT)
|
||||
prtstat_OBJECTS = $(am_prtstat_OBJECTS)
|
||||
prtstat_DEPENDENCIES =
|
||||
@@ -0,0 +1,47 @@
|
||||
[PATCH]: pstree: don't use glibc-specific __progname
|
||||
|
||||
uclibc (per default) doesn't implement __progname, and the pstree.x11
|
||||
stuff isn't that critical, so just disable it.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: psmisc-22.13/src/pstree.c
|
||||
===================================================================
|
||||
--- psmisc-22.13.orig/src/pstree.c 2010-07-12 13:10:03.000000000 +0200
|
||||
+++ psmisc-22.13/src/pstree.c 2011-05-21 16:33:37.456530775 +0200
|
||||
@@ -49,8 +49,6 @@
|
||||
#include <selinux/selinux.h>
|
||||
#endif /*WITH_SELINUX */
|
||||
|
||||
-extern const char *__progname;
|
||||
-
|
||||
#define PROC_BASE "/proc"
|
||||
|
||||
/* UTF-8 defines by Johan Myreen, updated by Ben Winslow */
|
||||
@@ -854,9 +852,6 @@
|
||||
textdomain(PACKAGE);
|
||||
#endif
|
||||
|
||||
- if (!strcmp(__progname, "pstree.x11"))
|
||||
- wait_end = 1;
|
||||
-
|
||||
/*
|
||||
* Attempt to figure out a good default symbol set. Will be overriden by
|
||||
* command-line options, if given.
|
||||
Index: psmisc-22.13/src/Makefile.in
|
||||
===================================================================
|
||||
--- psmisc-22.13.orig/src/Makefile.in 2011-05-21 16:33:42.748530777 +0200
|
||||
+++ psmisc-22.13/src/Makefile.in 2011-05-21 16:33:47.360530782 +0200
|
||||
@@ -557,10 +557,6 @@
|
||||
grep '^{ 1,"HUP" },$$' signames.h >/dev/null || \
|
||||
{ rm -f signames.h; exit 1; }
|
||||
|
||||
-install-exec-hook:
|
||||
- cd $(DESTDIR)$(bindir) && \
|
||||
- ( [ -h pstree.x11 ] || $(LN_S) pstree pstree.x11)
|
||||
-
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
8
deprecated/firmware/buildroot/package/psmisc/Config.in
Normal file
8
deprecated/firmware/buildroot/package/psmisc/Config.in
Normal file
@@ -0,0 +1,8 @@
|
||||
config BR2_PACKAGE_PSMISC
|
||||
bool "psmisc"
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||
help
|
||||
Helpful /proc related utilities such as pstree, fuser, and killall
|
||||
|
||||
http://psmisc.sourceforge.net/
|
||||
3
deprecated/firmware/buildroot/package/psmisc/psmisc.hash
Normal file
3
deprecated/firmware/buildroot/package/psmisc/psmisc.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a psmisc-22.21.tar.gz
|
||||
sha256 4f1cb11c7182ad96e682ec50a2d9a6a22079a2b11dffde3bb3cb67823b679422 e7203c36a2a4dc10cd8268a5dc036fc9c2a73b6c.diff
|
||||
25
deprecated/firmware/buildroot/package/psmisc/psmisc.mk
Normal file
25
deprecated/firmware/buildroot/package/psmisc/psmisc.mk
Normal file
@@ -0,0 +1,25 @@
|
||||
################################################################################
|
||||
#
|
||||
# psmisc
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PSMISC_VERSION = 22.21
|
||||
PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc
|
||||
PSMISC_PATCH = \
|
||||
https://gitlab.com/psmisc/psmisc/commit/e7203c36a2a4dc10cd8268a5dc036fc9c2a73b6c.diff
|
||||
PSMISC_LICENSE = GPLv2
|
||||
PSMISC_LICENSE_FILES = COPYING
|
||||
PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
|
||||
# Don't force -fstack-protector when SSP is not available in toolchain
|
||||
PSMISC_CONF_OPTS = --disable-harden-flags
|
||||
endif
|
||||
|
||||
# build after busybox, we prefer fat versions while we're at it
|
||||
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
PSMISC_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user