diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:11 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:57 +0100 |
commit | d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch) | |
tree | f36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta/recipes-extended/psmisc | |
parent | caab7fc509bf27706ff3248689f6afd04225cfda (diff) | |
download | poky-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz |
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/psmisc')
-rw-r--r-- | meta/recipes-extended/psmisc/files/libintl-link.patch | 29 | ||||
-rw-r--r-- | meta/recipes-extended/psmisc/psmisc.inc | 55 | ||||
-rw-r--r-- | meta/recipes-extended/psmisc/psmisc_22.2.bb | 2 |
3 files changed, 86 insertions, 0 deletions
diff --git a/meta/recipes-extended/psmisc/files/libintl-link.patch b/meta/recipes-extended/psmisc/files/libintl-link.patch new file mode 100644 index 0000000000..d9cdd90d71 --- /dev/null +++ b/meta/recipes-extended/psmisc/files/libintl-link.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | uClibc needs to link against an external libintl but it doesn't do this by | ||
2 | default. The configure script correctly figures out if this is needed, but | ||
3 | doesn't actually link to the libraries it decides on. This makes it link to | ||
4 | them 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/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc new file mode 100644 index 0000000000..d489891d64 --- /dev/null +++ b/meta/recipes-extended/psmisc/psmisc.inc | |||
@@ -0,0 +1,55 @@ | |||
1 | LICENSE = "GPL" | ||
2 | DESCRIPTION = "procfs tools" | ||
3 | SECTION = "base" | ||
4 | PRIORITY = "required" | ||
5 | DEPENDS = "ncurses virtual/libintl" | ||
6 | |||
7 | SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \ | ||
8 | file://libintl-link.patch;patch=1" | ||
9 | S = "${WORKDIR}/psmisc-${PV}" | ||
10 | |||
11 | inherit autotools gettext | ||
12 | |||
13 | ALLOW_EMPTY = "1" | ||
14 | |||
15 | PACKAGES = "${PN} \ | ||
16 | fuser-dbg fuser fuser-doc \ | ||
17 | killall-dbg killall killall-doc \ | ||
18 | pstree-dbg pstree pstree-doc" | ||
19 | |||
20 | FILES_${PN} = "" | ||
21 | RDEPENDS_${PN} = "fuser killall pstree" | ||
22 | |||
23 | FILES_fuser = "${bindir}/fuser.${PN}" | ||
24 | FILES_fuser-doc = "${mandir}/man1/fuser*" | ||
25 | FILES_fuser-dbg = "${bindir}/.debug/fuser" | ||
26 | |||
27 | FILES_killall = "${bindir}/killall.${PN}" | ||
28 | FILES_killall-doc = "${mandir}/man1/killall*" | ||
29 | FILES_killall-dbg = "${bindir}/.debug/killall*" | ||
30 | |||
31 | FILES_pstree = "${bindir}/pstree" | ||
32 | FILES_pstree-doc = "${mandir}/man1/pstree*" | ||
33 | FILES_pstree-dbg = "${bindir}/.debug/pstree" | ||
34 | |||
35 | do_install_append() { | ||
36 | mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN} | ||
37 | mv ${D}${bindir}/fuser ${D}${bindir}/fuser.${PN} | ||
38 | } | ||
39 | |||
40 | pkg_postinst_killall() { | ||
41 | update-alternatives --install ${bindir}/killall killall killall.${PN} 90 | ||
42 | } | ||
43 | |||
44 | pkg_postrm_killall() { | ||
45 | update-alternatives --remove ${bindir}/killall killall.${PN} | ||
46 | } | ||
47 | |||
48 | pkg_postinst_fuser() { | ||
49 | update-alternatives --install ${bindir}/fuser fuser fuser.${PN} 90 | ||
50 | } | ||
51 | |||
52 | pkg_postrm_fuser() { | ||
53 | update-alternatives --remove ${bindir}/fuser fuser.${PN} | ||
54 | } | ||
55 | |||
diff --git a/meta/recipes-extended/psmisc/psmisc_22.2.bb b/meta/recipes-extended/psmisc/psmisc_22.2.bb new file mode 100644 index 0000000000..62327fa4d6 --- /dev/null +++ b/meta/recipes-extended/psmisc/psmisc_22.2.bb | |||
@@ -0,0 +1,2 @@ | |||
1 | require psmisc.inc | ||
2 | PR = "r1" | ||