psmisc: Update to 22.14

* Create psmisc-extras for unpackaged binaries
 * rebase patch
 * set LICENSE to GPLv2

(From OE-Core rev: db339e1955ea95f9a3dd3c65677bad6b6e7fa0ea)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2011-12-01 13:48:04 -08:00 committed by Richard Purdie
parent 338f90982e
commit 1131efec32
4 changed files with 25 additions and 19 deletions

View File

@ -6,25 +6,27 @@ default. The configure script correctly figures out if this is needed, but
doesn't actually link to the libraries it decides on. This makes it link to
them if they are needed:
--- psmisc-22.13/src/Makefile.am
+++ psmisc-22.13/src/Makefile.am
@@ -25,16 +25,17 @@ endif
Index: psmisc-22.14/src/Makefile.am
===================================================================
--- psmisc-22.14.orig/src/Makefile.am 2011-06-20 04:59:44.000000000 -0700
+++ psmisc-22.14/src/Makefile.am 2011-12-01 10:19:55.792680654 -0800
@@ -26,15 +26,17 @@
fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.h
fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
+fuser_LDADD = @INTLLIBS@
+
killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
-killall_LDADD = @SELINUX_LIB@
+killall_LDADD = @SELINUX_LIB@ @INTLLIBS@
peekfd_SOURCES = peekfd.c
pstree_SOURCES = pstree.c comm.h i18n.h
-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
+pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@
prtstat_SOURCES = prtstat.c prtstat.h

View File

@ -1,4 +1,3 @@
LICENSE = "GPL"
SUMMARY = "Utilities for managing processes on your system"
DESCRIPTION = "The psmisc package contains utilities for managing processes on your \
system: pstree, killall and fuser. The pstree command displays a tree \
@ -8,6 +7,7 @@ processes identified by name. The fuser command identifies the PIDs \
of processes that are using specified files or filesystems."
SECTION = "base"
DEPENDS = "ncurses virtual/libintl"
LICENSE = "GPLv2"
SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
file://libintl-link.patch"
@ -17,7 +17,8 @@ inherit autotools gettext
ALLOW_EMPTY = "1"
PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc "
PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc"
PACKAGES += "psmisc-extras"
FILES_${PN} = ""
RDEPENDS_${PN} = "fuser killall pstree"
@ -31,6 +32,9 @@ FILES_killall-doc = "${mandir}/man1/killall*"
FILES_pstree = "${bindir}/pstree"
FILES_pstree-doc = "${mandir}/man1/pstree*"
FILES_psmisc-extras = "${bindir}"
FILES_psmisc-extras-doc = "${mandir}"
do_install_append() {
mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN}
mv ${D}${bindir}/fuser ${D}${bindir}/fuser.${PN}

View File

@ -1,7 +0,0 @@
require psmisc.inc
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
PR = "r1"
SRC_URI[md5sum] = "e2c339e6b65b730042084023784a729e"
SRC_URI[sha256sum] = "06d25e8ebb4722dbcede98a787c39a9ed341f8e58fde10c0b2d6b35990b35daa"

View File

@ -0,0 +1,7 @@
require psmisc.inc
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
PR = "r0"
SRC_URI[md5sum] = "ba3f4e971895c92bba7770d81c981503"
SRC_URI[sha256sum] = "22bbf4561837af475c0d8d14e3b9cab453998c787212c107fac7faf2f281e26e"