diff options
| author | Saul Wold <sgw@linux.intel.com> | 2012-02-27 00:46:58 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-28 12:14:49 +0000 |
| commit | f3aad7c3a88dbe171147a703b98488c00a615fcf (patch) | |
| tree | 9d80845ba9f33412b37301fdc2fecbd028d1d4d2 /meta/recipes-extended/psmisc | |
| parent | 1cd88605f9fb989b854081e7d4b68874c6656250 (diff) | |
| download | openembedded-core-f3aad7c3a88dbe171147a703b98488c00a615fcf.tar.gz openembedded-core-f3aad7c3a88dbe171147a703b98488c00a615fcf.tar.bz2 openembedded-core-f3aad7c3a88dbe171147a703b98488c00a615fcf.zip | |
psmisc: Update to version 22.16
Remove libintl-link patch which has in the upstream code now
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/psmisc')
| -rw-r--r-- | meta/recipes-extended/psmisc/files/libintl-link.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-extended/psmisc/psmisc.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-extended/psmisc/psmisc_22.14.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-extended/psmisc/psmisc_22.16.bb | 7 |
4 files changed, 9 insertions, 41 deletions
diff --git a/meta/recipes-extended/psmisc/files/libintl-link.patch b/meta/recipes-extended/psmisc/files/libintl-link.patch deleted file mode 100644 index e42592ca2e..0000000000 --- a/meta/recipes-extended/psmisc/files/libintl-link.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Mei Lei <lei.mei@intel.com> - -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: - -Index: psmisc-22.14/src/Makefile.am -=================================================================== ---- psmisc-22.14.orig/src/Makefile.am 2011-06-20 04:59:44.000000000 -0700 -+++ psmisc-22.14/src/Makefile.am 2011-12-01 10:19:55.792680654 -0800 -@@ -26,15 +26,17 @@ - - fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.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@ - - peekfd_SOURCES = peekfd.c - - pstree_SOURCES = pstree.c comm.h i18n.h - --pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ -+pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@ - - prtstat_SOURCES = prtstat.c prtstat.h - diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc index 9e281d5c63..4e9aad862d 100644 --- a/meta/recipes-extended/psmisc/psmisc.inc +++ b/meta/recipes-extended/psmisc/psmisc.inc @@ -9,8 +9,8 @@ SECTION = "base" DEPENDS = "ncurses virtual/libintl" LICENSE = "GPLv2" -SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \ - file://libintl-link.patch" +SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz" + S = "${WORKDIR}/psmisc-${PV}" inherit autotools gettext diff --git a/meta/recipes-extended/psmisc/psmisc_22.14.bb b/meta/recipes-extended/psmisc/psmisc_22.14.bb deleted file mode 100644 index 4f89672929..0000000000 --- a/meta/recipes-extended/psmisc/psmisc_22.14.bb +++ /dev/null @@ -1,7 +0,0 @@ -require psmisc.inc -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -PR = "r0" - -SRC_URI[md5sum] = "ba3f4e971895c92bba7770d81c981503" -SRC_URI[sha256sum] = "22bbf4561837af475c0d8d14e3b9cab453998c787212c107fac7faf2f281e26e" diff --git a/meta/recipes-extended/psmisc/psmisc_22.16.bb b/meta/recipes-extended/psmisc/psmisc_22.16.bb new file mode 100644 index 0000000000..ac3bd28aef --- /dev/null +++ b/meta/recipes-extended/psmisc/psmisc_22.16.bb @@ -0,0 +1,7 @@ +require psmisc.inc +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" +PR = "r0" + +SRC_URI[md5sum] = "d52caf26159c905574c2ce4bd792b9ee" +SRC_URI[sha256sum] = "ae426d7238e5353fdf51b1d313897c2bbed0023e66e5b4af2be9cd03d87a9d01" |