summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-02-27 08:46:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:27:47 (GMT)
commit86d3f776aa3a6bf5e9d10dff97295dc20484feb0 (patch)
treeb7eedbac86df45e0e3cc2f022ca80c443d1702f2
parentdebd4da669ac312207652d4f5e56d35a3cac1202 (diff)
downloadpoky-86d3f776aa3a6bf5e9d10dff97295dc20484feb0.tar.gz
psmisc: Update to version 22.16
Remove libintl-link patch which has in the upstream code now (From OE-Core rev: f3aad7c3a88dbe171147a703b98488c00a615fcf) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/psmisc/files/libintl-link.patch32
-rw-r--r--meta/recipes-extended/psmisc/psmisc.inc4
-rw-r--r--meta/recipes-extended/psmisc/psmisc_22.14.bb7
-rw-r--r--meta/recipes-extended/psmisc/psmisc_22.16.bb7
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 e42592c..0000000
--- a/meta/recipes-extended/psmisc/files/libintl-link.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2Signed-off-by: Mei Lei <lei.mei@intel.com>
3
4uClibc needs to link against an external libintl but it doesn't do this by
5default. The configure script correctly figures out if this is needed, but
6doesn't actually link to the libraries it decides on. This makes it link to
7them if they are needed:
8
9Index: psmisc-22.14/src/Makefile.am
10===================================================================
11--- psmisc-22.14.orig/src/Makefile.am 2011-06-20 04:59:44.000000000 -0700
12+++ psmisc-22.14/src/Makefile.am 2011-12-01 10:19:55.792680654 -0800
13@@ -26,15 +26,17 @@
14
15 fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.h
16
17+fuser_LDADD = @INTLLIBS@
18+
19 killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
20
21-killall_LDADD = @SELINUX_LIB@
22+killall_LDADD = @SELINUX_LIB@ @INTLLIBS@
23
24 peekfd_SOURCES = peekfd.c
25
26 pstree_SOURCES = pstree.c comm.h i18n.h
27
28-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
29+pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@
30
31 prtstat_SOURCES = prtstat.c prtstat.h
32
diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc
index 9e281d5..4e9aad8 100644
--- a/meta/recipes-extended/psmisc/psmisc.inc
+++ b/meta/recipes-extended/psmisc/psmisc.inc
@@ -9,8 +9,8 @@ SECTION = "base"
9DEPENDS = "ncurses virtual/libintl" 9DEPENDS = "ncurses virtual/libintl"
10LICENSE = "GPLv2" 10LICENSE = "GPLv2"
11 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \ 12SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz"
13 file://libintl-link.patch" 13
14S = "${WORKDIR}/psmisc-${PV}" 14S = "${WORKDIR}/psmisc-${PV}"
15 15
16inherit autotools gettext 16inherit 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 4f89672..0000000
--- a/meta/recipes-extended/psmisc/psmisc_22.14.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require psmisc.inc
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
4PR = "r0"
5
6SRC_URI[md5sum] = "ba3f4e971895c92bba7770d81c981503"
7SRC_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 0000000..ac3bd28
--- /dev/null
+++ b/meta/recipes-extended/psmisc/psmisc_22.16.bb
@@ -0,0 +1,7 @@
1require psmisc.inc
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
4PR = "r0"
5
6SRC_URI[md5sum] = "d52caf26159c905574c2ce4bd792b9ee"
7SRC_URI[sha256sum] = "ae426d7238e5353fdf51b1d313897c2bbed0023e66e5b4af2be9cd03d87a9d01"