3 files changed, 55 insertions, 110 deletions

diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc
deleted file mode 100644
index 23e98d21be..0000000000
--- a/meta/recipes-extended/psmisc/psmisc.inc
+++ /dev/null
@@ -1,59 +0,0 @@
-SUMMARY = "Utilities for managing processes on your system"
-HOMEPAGE = "http://psmisc.sf.net/"
-DESCRIPTION = "The psmisc package contains utilities for managing processes on your \
-system: pstree, killall and fuser.  The pstree command displays a tree \
-structure of all of the running processes on your system.  The killall \
-command sends a specified signal (SIGTERM if nothing is specified) to \
-processes identified by name.  The fuser command identifies the PIDs \
-of processes that are using specified files or filesystems."
-SECTION = "base"
-DEPENDS = "ncurses virtual/libintl"
-LICENSE = "GPL-2.0-only"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz"
-
-S = "${WORKDIR}/psmisc-${PV}"
-
-inherit autotools gettext
-
-# Upstream has a custom autogen.sh which invokes po/update-potfiles as they 
-# don't ship a po/POTFILES.in (which is silly).  Without that file gettext 
-# doesn't believe po/ is a gettext directory and won't generate po/Makefile.
-do_configure:prepend() {
-    ( cd ${S} && po/update-potfiles )
-}
-
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
-
-ALLOW_EMPTY:${PN} = "1"
-
-PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc"
-PACKAGES += "psmisc-extras"
-
-FILES:${PN} = ""
-RDEPENDS:${PN} = "fuser killall pstree"
-
-FILES:fuser = "${bindir}/fuser.${BPN}"
-FILES:fuser-doc = "${mandir}/man1/fuser*"
-
-FILES:killall = "${bindir}/killall.${BPN}"
-FILES:killall-doc = "${mandir}/man1/killall*"
-
-FILES:pstree = "${bindir}/pstree"
-FILES:pstree-doc = "${mandir}/man1/pstree*"
-
-FILES:psmisc-extras = "${bindir}"
-FILES:psmisc-extras-doc = "${mandir}"
-
-inherit update-alternatives
-
-ALTERNATIVE_PRIORITY = "90"
-
-ALTERNATIVE:killall = "killall"
-
-ALTERNATIVE:fuser = "fuser"
-
-ALTERNATIVE:pstree = "pstree"
diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch b/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
deleted file mode 100644
index 01335bdf40..0000000000
--- a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 338d2d46d1c20ebadf317938af98d0532a62f8d4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 24 Mar 2016 15:46:14 +0000
-Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE
-
-Do not include sys/user.h since it conflicts with
-pt_regs struct from kernel APIs in asm/ptrace.h
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
----
- src/peekfd.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/src/peekfd.c b/src/peekfd.c
-index 36dff04..2b4b1dc 100644
---- a/src/peekfd.c
-+++ b/src/peekfd.c
-@@ -30,8 +30,11 @@
- #include <asm/ptrace.h>
- #include <byteswap.h>
- #include <endian.h>
-+#ifdef __GLIBC__
- #include <sys/user.h>
-+#endif
- #include <stdlib.h>
-+#include <stdint.h>
- #include <getopt.h>
- #include <ctype.h>
- #include <dirent.h>
-@@ -341,11 +344,11 @@ int main(int argc, char **argv)
-                if (WIFSTOPPED(status)) {
- #ifdef PPC
-                        struct pt_regs regs;
--                       regs.gpr[0] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R0, 0);
--                       regs.gpr[3] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R3, 0);
--                       regs.gpr[4] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R4, 0);
--                       regs.gpr[5] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R5, 0);
--                       regs.orig_gpr3 = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_ORIG_R3, 0);
-+                       regs.gpr[0] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R0, 0);
-+                       regs.gpr[3] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R3, 0);
-+                       regs.gpr[4] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R4, 0);
-+                       regs.gpr[5] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R5, 0);
-+                       regs.orig_gpr3 = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_ORIG_R3, 0);
- #elif defined(ARM)
-                        struct pt_regs regs;
-                        ptrace(PTRACE_GETREGS, pid, 0, &regs);
diff --git a/meta/recipes-extended/psmisc/psmisc_23.7.bb b/meta/recipes-extended/psmisc/psmisc_23.7.bb
index ea272cd92d..44f8530977 100644
--- a/meta/recipes-extended/psmisc/psmisc_23.7.bb
+++ b/meta/recipes-extended/psmisc/psmisc_23.7.bb
@@ -1,9 +1,60 @@
-require psmisc.inc
+SUMMARY = "Utilities for managing processes on your system"
+HOMEPAGE = "http://psmisc.sf.net/"
+DESCRIPTION = "The psmisc package contains utilities for managing processes on your \
+system: pstree, killall and fuser.  The pstree command displays a tree \
+structure of all of the running processes on your system.  The killall \
+command sends a specified signal (SIGTERM if nothing is specified) to \
+processes identified by name.  The fuser command identifies the PIDs \
+of processes that are using specified files or filesystems."
+SECTION = "base"
+DEPENDS = "ncurses virtual/libintl"
+
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
-SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \
-           file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
+SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master;tag=v${PV} \
            "
 SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c"
-S = "${WORKDIR}/git"
+
+inherit autotools gettext
+
+# Upstream has a custom autogen.sh which invokes po/update-potfiles as they 
+# don't ship a po/POTFILES.in (which is silly).  Without that file gettext 
+# doesn't believe po/ is a gettext directory and won't generate po/Makefile.
+do_configure:prepend() {
+    ( cd ${S} && po/update-potfiles )
+}
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
+
+ALLOW_EMPTY:${PN} = "1"
+
+PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc"
+PACKAGES += "psmisc-extras"
+
+FILES:${PN} = ""
+RDEPENDS:${PN} = "fuser killall pstree"
+
+FILES:fuser = "${bindir}/fuser.${BPN}"
+FILES:fuser-doc = "${mandir}/man1/fuser*"
+
+FILES:killall = "${bindir}/killall.${BPN}"
+FILES:killall-doc = "${mandir}/man1/killall*"
+
+FILES:pstree = "${bindir}/pstree"
+FILES:pstree-doc = "${mandir}/man1/pstree*"
+
+FILES:psmisc-extras = "${bindir}"
+FILES:psmisc-extras-doc = "${mandir}"
+
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "90"
+
+ALTERNATIVE:killall = "killall"
+
+ALTERNATIVE:fuser = "fuser"
+
+ALTERNATIVE:pstree = "pstree"