summaryrefslogtreecommitdiffstats
path: root/meta/packages/psmisc
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/psmisc')
-rw-r--r--meta/packages/psmisc/files/libintl-link.patch29
-rw-r--r--meta/packages/psmisc/psmisc.inc55
-rw-r--r--meta/packages/psmisc/psmisc_22.2.bb2
3 files changed, 0 insertions, 86 deletions
diff --git a/meta/packages/psmisc/files/libintl-link.patch b/meta/packages/psmisc/files/libintl-link.patch
deleted file mode 100644
index d9cdd90d71..0000000000
--- a/meta/packages/psmisc/files/libintl-link.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1uClibc needs to link against an external libintl but it doesn't do this by
2default. The configure script correctly figures out if this is needed, but
3doesn't actually link to the libraries it decides on. This makes it link to
4them if they are needed:
5
6--- psmisc-22.2/src/Makefile.am 2006/06/28 00:14:07 1.1
7+++ psmisc-22.2/src/Makefile.am 2006/06/28 00:14:24
8@@ -5,15 +5,19 @@
9
10 oldfuser_SOURCES = oldfuser.c comm.h signals.c signals.h loop.h i18n.h
11
12+oldfuser_LDADD = @INTLLIBS@
13+
14 fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
15
16+fuser_LDADD = @INTLLIBS@
17+
18 killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
19
20-killall_LDADD = @SELINUX_LIB@
21+killall_LDADD = @SELINUX_LIB@ @INTLLIBS@
22
23 pstree_SOURCES = pstree.c comm.h i18n.h
24
25-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
26+pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@
27
28 BUILT_SOURCES = signames.h
29
diff --git a/meta/packages/psmisc/psmisc.inc b/meta/packages/psmisc/psmisc.inc
deleted file mode 100644
index d489891d64..0000000000
--- a/meta/packages/psmisc/psmisc.inc
+++ /dev/null
@@ -1,55 +0,0 @@
1LICENSE = "GPL"
2DESCRIPTION = "procfs tools"
3SECTION = "base"
4PRIORITY = "required"
5DEPENDS = "ncurses virtual/libintl"
6
7SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
8 file://libintl-link.patch;patch=1"
9S = "${WORKDIR}/psmisc-${PV}"
10
11inherit autotools gettext
12
13ALLOW_EMPTY = "1"
14
15PACKAGES = "${PN} \
16 fuser-dbg fuser fuser-doc \
17 killall-dbg killall killall-doc \
18 pstree-dbg pstree pstree-doc"
19
20FILES_${PN} = ""
21RDEPENDS_${PN} = "fuser killall pstree"
22
23FILES_fuser = "${bindir}/fuser.${PN}"
24FILES_fuser-doc = "${mandir}/man1/fuser*"
25FILES_fuser-dbg = "${bindir}/.debug/fuser"
26
27FILES_killall = "${bindir}/killall.${PN}"
28FILES_killall-doc = "${mandir}/man1/killall*"
29FILES_killall-dbg = "${bindir}/.debug/killall*"
30
31FILES_pstree = "${bindir}/pstree"
32FILES_pstree-doc = "${mandir}/man1/pstree*"
33FILES_pstree-dbg = "${bindir}/.debug/pstree"
34
35do_install_append() {
36 mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN}
37 mv ${D}${bindir}/fuser ${D}${bindir}/fuser.${PN}
38}
39
40pkg_postinst_killall() {
41 update-alternatives --install ${bindir}/killall killall killall.${PN} 90
42}
43
44pkg_postrm_killall() {
45 update-alternatives --remove ${bindir}/killall killall.${PN}
46}
47
48pkg_postinst_fuser() {
49 update-alternatives --install ${bindir}/fuser fuser fuser.${PN} 90
50}
51
52pkg_postrm_fuser() {
53 update-alternatives --remove ${bindir}/fuser fuser.${PN}
54}
55
diff --git a/meta/packages/psmisc/psmisc_22.2.bb b/meta/packages/psmisc/psmisc_22.2.bb
deleted file mode 100644
index 62327fa4d6..0000000000
--- a/meta/packages/psmisc/psmisc_22.2.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require psmisc.inc
2PR = "r1"