psmisc: upgraded to 22.2 from OE (with uClibc fix)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3543 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
979d581764
commit
bed9c6e971
|
@ -0,0 +1,29 @@
|
|||
uClibc needs to link against an external libintl but it doesn't do this by
|
||||
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.2/src/Makefile.am 2006/06/28 00:14:07 1.1
|
||||
+++ psmisc-22.2/src/Makefile.am 2006/06/28 00:14:24
|
||||
@@ -5,15 +5,19 @@
|
||||
|
||||
oldfuser_SOURCES = oldfuser.c comm.h signals.c signals.h loop.h i18n.h
|
||||
|
||||
+oldfuser_LDADD = @INTLLIBS@
|
||||
+
|
||||
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@
|
||||
|
||||
pstree_SOURCES = pstree.c comm.h i18n.h
|
||||
|
||||
-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
|
||||
+pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@
|
||||
|
||||
BUILT_SOURCES = signames.h
|
||||
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,55 @@
|
|||
LICENSE = "GPL"
|
||||
DESCRIPTION = "procfs tools"
|
||||
SECTION = "base"
|
||||
PRIORITY = "required"
|
||||
DEPENDS = "ncurses virtual/libintl"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
|
||||
file://libintl-link.patch;patch=1"
|
||||
S = "${WORKDIR}/psmisc-${PV}"
|
||||
|
||||
inherit autotools gettext
|
||||
|
||||
ALLOW_EMPTY = "1"
|
||||
|
||||
PACKAGES = "${PN} \
|
||||
fuser-dbg fuser fuser-doc \
|
||||
killall-dbg killall killall-doc \
|
||||
pstree-dbg pstree pstree-doc"
|
||||
|
||||
FILES_${PN} = ""
|
||||
RDEPENDS_${PN} = "fuser killall pstree"
|
||||
|
||||
FILES_fuser = "${bindir}/fuser.${PN}"
|
||||
FILES_fuser-doc = "${mandir}/man1/fuser*"
|
||||
FILES_fuser-dbg = "${bindir}/.debug/fuser"
|
||||
|
||||
FILES_killall = "${bindir}/killall.${PN}"
|
||||
FILES_killall-doc = "${mandir}/man1/killall*"
|
||||
FILES_killall-dbg = "${bindir}/.debug/killall*"
|
||||
|
||||
FILES_pstree = "${bindir}/pstree"
|
||||
FILES_pstree-doc = "${mandir}/man1/pstree*"
|
||||
FILES_pstree-dbg = "${bindir}/.debug/pstree"
|
||||
|
||||
do_install_append() {
|
||||
mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN}
|
||||
mv ${D}${bindir}/fuser ${D}${bindir}/fuser.${PN}
|
||||
}
|
||||
|
||||
pkg_postinst_killall() {
|
||||
update-alternatives --install ${bindir}/killall killall killall.${PN} 90
|
||||
}
|
||||
|
||||
pkg_postrm_killall() {
|
||||
update-alternatives --remove ${bindir}/killall killall.${PN}
|
||||
}
|
||||
|
||||
pkg_postinst_fuser() {
|
||||
update-alternatives --install ${bindir}/fuser fuser fuser.${PN} 90
|
||||
}
|
||||
|
||||
pkg_postrm_fuser() {
|
||||
update-alternatives --remove ${bindir}/fuser fuser.${PN}
|
||||
}
|
||||
|
|
@ -1,46 +1,5 @@
|
|||
LICENSE = "GPL"
|
||||
DESCRIPTION = "procfs tools"
|
||||
SECTION = "base"
|
||||
PRIORITY = "required"
|
||||
DEPENDS = "ncurses"
|
||||
PR = "r4"
|
||||
require psmisc.inc
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
|
||||
file://gettext.patch;patch=1"
|
||||
S = "${WORKDIR}/psmisc-${PV}"
|
||||
PR = "r5"
|
||||
|
||||
inherit autotools gettext
|
||||
|
||||
ALLOW_EMPTY_${PN} = "1"
|
||||
|
||||
PACKAGES = "${PN} \
|
||||
fuser-dbg fuser fuser-doc \
|
||||
killall-dbg killall killall-doc \
|
||||
pstree-dbg pstree pstree-doc"
|
||||
|
||||
FILES_${PN} = ""
|
||||
RDEPENDS_${PN} = "fuser killall pstree"
|
||||
|
||||
FILES_fuser = "${bindir}/fuser"
|
||||
FILES_fuser-doc = "${mandir}/man1/fuser*"
|
||||
FILES_fuser-dbg = "${bindir}/.debug/fuser"
|
||||
|
||||
FILES_killall = "${bindir}/killall.${PN}"
|
||||
FILES_killall-doc = "${mandir}/man1/killall*"
|
||||
FILES_killall-dbg = "${bindir}/.debug/killall*"
|
||||
|
||||
FILES_pstree = "${bindir}/pstree"
|
||||
FILES_pstree-doc = "${mandir}/man1/pstree*"
|
||||
FILES_pstree-dbg = "${bindir}/.debug/pstree"
|
||||
|
||||
do_install_append() {
|
||||
mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN}
|
||||
}
|
||||
|
||||
pkg_postinst_killall() {
|
||||
update-alternatives --install ${bindir}/killall killall killall.${PN} 90
|
||||
}
|
||||
|
||||
pkg_postrm_killall() {
|
||||
update-alternatives --remove ${bindir}/killall killall.${PN}
|
||||
}
|
||||
SRC_URI += "file://gettext.patch;patch=1"
|
||||
|
|
Loading…
Reference in New Issue