summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-12-01 21:48:04 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-02 15:14:01 (GMT)
commit1131efec323dc380252cabf60e1c6a8e8a353bbd (patch)
tree7424597feccaf7ecba24e2a050f767abe2b50d3d
parent338f90982e1b4d00dece751964fef8a02d25f298 (diff)
downloadpoky-1131efec323dc380252cabf60e1c6a8e8a353bbd.tar.gz
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>
-rw-r--r--meta/recipes-extended/psmisc/files/libintl-link.patch22
-rw-r--r--meta/recipes-extended/psmisc/psmisc.inc8
-rw-r--r--meta/recipes-extended/psmisc/psmisc_22.13.bb7
-rw-r--r--meta/recipes-extended/psmisc/psmisc_22.14.bb7
4 files changed, 25 insertions, 19 deletions
diff --git a/meta/recipes-extended/psmisc/files/libintl-link.patch b/meta/recipes-extended/psmisc/files/libintl-link.patch
index 698d98a..e42592c 100644
--- a/meta/recipes-extended/psmisc/files/libintl-link.patch
+++ b/meta/recipes-extended/psmisc/files/libintl-link.patch
@@ -6,25 +6,27 @@ default. The configure script correctly figures out if this is needed, but
6doesn't actually link to the libraries it decides on. This makes it link to 6doesn't actually link to the libraries it decides on. This makes it link to
7them if they are needed: 7them if they are needed:
8 8
9--- psmisc-22.13/src/Makefile.am 9Index: psmisc-22.14/src/Makefile.am
10+++ psmisc-22.13/src/Makefile.am 10===================================================================
11@@ -25,16 +25,17 @@ endif 11--- psmisc-22.14.orig/src/Makefile.am 2011-06-20 04:59:44.000000000 -0700
12+++ psmisc-22.14/src/Makefile.am 2011-12-01 10:19:55.792680654 -0800
13@@ -26,15 +26,17 @@
12 14
15 fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.h
13 16
14 fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
15+fuser_LDADD = @INTLLIBS@ 17+fuser_LDADD = @INTLLIBS@
16 18+
17 killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h 19 killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
18 20
19-killall_LDADD = @SELINUX_LIB@ 21-killall_LDADD = @SELINUX_LIB@
20+killall_LDADD = @SELINUX_LIB@ @INTLLIBS@ 22+killall_LDADD = @SELINUX_LIB@ @INTLLIBS@
21 23
22 peekfd_SOURCES = peekfd.c 24 peekfd_SOURCES = peekfd.c
23 25
24 pstree_SOURCES = pstree.c comm.h i18n.h 26 pstree_SOURCES = pstree.c comm.h i18n.h
25 27
26-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ 28-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
27+pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@ 29+pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@
28 30
29 prtstat_SOURCES = prtstat.c prtstat.h 31 prtstat_SOURCES = prtstat.c prtstat.h
30 32
diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc
index 77047cc..9e281d5 100644
--- a/meta/recipes-extended/psmisc/psmisc.inc
+++ b/meta/recipes-extended/psmisc/psmisc.inc
@@ -1,4 +1,3 @@
1LICENSE = "GPL"
2SUMMARY = "Utilities for managing processes on your system" 1SUMMARY = "Utilities for managing processes on your system"
3DESCRIPTION = "The psmisc package contains utilities for managing processes on your \ 2DESCRIPTION = "The psmisc package contains utilities for managing processes on your \
4system: pstree, killall and fuser. The pstree command displays a tree \ 3system: pstree, killall and fuser. The pstree command displays a tree \
@@ -8,6 +7,7 @@ processes identified by name. The fuser command identifies the PIDs \
8of processes that are using specified files or filesystems." 7of processes that are using specified files or filesystems."
9SECTION = "base" 8SECTION = "base"
10DEPENDS = "ncurses virtual/libintl" 9DEPENDS = "ncurses virtual/libintl"
10LICENSE = "GPLv2"
11 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \ 12SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
13 file://libintl-link.patch" 13 file://libintl-link.patch"
@@ -17,7 +17,8 @@ inherit autotools gettext
17 17
18ALLOW_EMPTY = "1" 18ALLOW_EMPTY = "1"
19 19
20PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc " 20PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc"
21PACKAGES += "psmisc-extras"
21 22
22FILES_${PN} = "" 23FILES_${PN} = ""
23RDEPENDS_${PN} = "fuser killall pstree" 24RDEPENDS_${PN} = "fuser killall pstree"
@@ -31,6 +32,9 @@ FILES_killall-doc = "${mandir}/man1/killall*"
31FILES_pstree = "${bindir}/pstree" 32FILES_pstree = "${bindir}/pstree"
32FILES_pstree-doc = "${mandir}/man1/pstree*" 33FILES_pstree-doc = "${mandir}/man1/pstree*"
33 34
35FILES_psmisc-extras = "${bindir}"
36FILES_psmisc-extras-doc = "${mandir}"
37
34do_install_append() { 38do_install_append() {
35 mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN} 39 mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN}
36 mv ${D}${bindir}/fuser ${D}${bindir}/fuser.${PN} 40 mv ${D}${bindir}/fuser ${D}${bindir}/fuser.${PN}
diff --git a/meta/recipes-extended/psmisc/psmisc_22.13.bb b/meta/recipes-extended/psmisc/psmisc_22.13.bb
deleted file mode 100644
index 757e097..0000000
--- a/meta/recipes-extended/psmisc/psmisc_22.13.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require psmisc.inc
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
4PR = "r1"
5
6SRC_URI[md5sum] = "e2c339e6b65b730042084023784a729e"
7SRC_URI[sha256sum] = "06d25e8ebb4722dbcede98a787c39a9ed341f8e58fde10c0b2d6b35990b35daa"
diff --git a/meta/recipes-extended/psmisc/psmisc_22.14.bb b/meta/recipes-extended/psmisc/psmisc_22.14.bb
new file mode 100644
index 0000000..4f89672
--- /dev/null
+++ b/meta/recipes-extended/psmisc/psmisc_22.14.bb
@@ -0,0 +1,7 @@
1require psmisc.inc
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
4PR = "r0"
5
6SRC_URI[md5sum] = "ba3f4e971895c92bba7770d81c981503"
7SRC_URI[sha256sum] = "22bbf4561837af475c0d8d14e3b9cab453998c787212c107fac7faf2f281e26e"