From 660a0feb66e64979ec74a6e58d0b8d190bd4e5eb Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Mon, 3 Jul 2006 03:25:30 +0000 Subject: psmisc 22.2: Add 22.2 and use a common .inc file for 21.8 and 22.8. Added to fix some IPv6 related bugs. See the changelog in 22.2 source for full list. --- packages/psmisc/files/.mtn2git_empty | 0 packages/psmisc/files/libintl-link.patch | 29 +++++++++++++++++ packages/psmisc/psmisc-21.8/libintl-link.patch | 29 ----------------- packages/psmisc/psmisc.inc | 42 ++++++++++++++++++++++++ packages/psmisc/psmisc_21.8.bb | 45 ++------------------------ packages/psmisc/psmisc_22.2.bb | 2 ++ 6 files changed, 75 insertions(+), 72 deletions(-) create mode 100644 packages/psmisc/files/.mtn2git_empty create mode 100644 packages/psmisc/files/libintl-link.patch delete mode 100644 packages/psmisc/psmisc-21.8/libintl-link.patch create mode 100644 packages/psmisc/psmisc.inc create mode 100644 packages/psmisc/psmisc_22.2.bb diff --git a/packages/psmisc/files/.mtn2git_empty b/packages/psmisc/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/psmisc/files/libintl-link.patch b/packages/psmisc/files/libintl-link.patch new file mode 100644 index 0000000000..d9cdd90d71 --- /dev/null +++ b/packages/psmisc/files/libintl-link.patch @@ -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 + diff --git a/packages/psmisc/psmisc-21.8/libintl-link.patch b/packages/psmisc/psmisc-21.8/libintl-link.patch deleted file mode 100644 index d9cdd90d71..0000000000 --- a/packages/psmisc/psmisc-21.8/libintl-link.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - diff --git a/packages/psmisc/psmisc.inc b/packages/psmisc/psmisc.inc new file mode 100644 index 0000000000..31647c7b4b --- /dev/null +++ b/packages/psmisc/psmisc.inc @@ -0,0 +1,42 @@ +LICENSE = "GPL" +DESCRIPTION = "procfs tools" +SECTION = "base" +PRIORITY = "required" +MAINTAINER = "Greg Gilbert " +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 fuser-doc \ + killall killall-doc \ + pstree pstree-doc" + +FILES_${PN} = "" +RDEPENDS_${PN} = "fuser killall pstree" + +FILES_fuser = "${bindir}/fuser" +FILES_fuser-doc = "${mandir}/man1/fuser*" + +FILES_killall = "${bindir}/killall.${PN}" +FILES_killall-doc = "${mandir}/man1/killall*" + +FILES_pstree = "${bindir}/pstree" +FILES_pstree-doc = "${mandir}/man1/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} +} diff --git a/packages/psmisc/psmisc_21.8.bb b/packages/psmisc/psmisc_21.8.bb index f7d6828a94..085ee18a77 100644 --- a/packages/psmisc/psmisc_21.8.bb +++ b/packages/psmisc/psmisc_21.8.bb @@ -1,44 +1,3 @@ -LICENSE = "GPL" -DESCRIPTION = "procfs tools" -SECTION = "base" -PRIORITY = "required" -MAINTAINER = "Greg Gilbert " -DEPENDS = "ncurses virtual/libintl" +include psmisc.inc PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \ - file://signames-header-fix.patch;patch=1 \ - file://libintl-link.patch;patch=1" -S = "${WORKDIR}/psmisc-${PV}" - -inherit autotools gettext - -ALLOW_EMPTY = "1" - -PACKAGES = "${PN} fuser fuser-doc \ - killall killall-doc \ - pstree pstree-doc" - -FILES_${PN} = "" -RDEPENDS_${PN} = "fuser killall pstree" - -FILES_fuser = "${bindir}/fuser" -FILES_fuser-doc = "${mandir}/man1/fuser*" - -FILES_killall = "${bindir}/killall.${PN}" -FILES_killall-doc = "${mandir}/man1/killall*" - -FILES_pstree = "${bindir}/pstree" -FILES_pstree-doc = "${mandir}/man1/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://signames-header-fix.patch;patch=1" diff --git a/packages/psmisc/psmisc_22.2.bb b/packages/psmisc/psmisc_22.2.bb new file mode 100644 index 0000000000..6bf1780582 --- /dev/null +++ b/packages/psmisc/psmisc_22.2.bb @@ -0,0 +1,2 @@ +include psmisc.inc +PR = "r0" -- cgit v1.2.3