summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/psmisc
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
commit972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch)
tree97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-extended/psmisc
downloadpoky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-extended/psmisc')
-rw-r--r--meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch46
-rw-r--r--meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch29
-rw-r--r--meta/recipes-extended/psmisc/psmisc.inc44
-rw-r--r--meta/recipes-extended/psmisc/psmisc_22.21.bb10
4 files changed, 129 insertions, 0 deletions
diff --git a/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch b/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
new file mode 100644
index 0000000000..e57d60f6a3
--- /dev/null
+++ b/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
@@ -0,0 +1,46 @@
1From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001
2From: Brad Jorsch <anomie@users.sourceforge.net>
3Date: Fri, 28 Feb 2014 21:55:02 +1100
4Subject: [PATCH] Typo in fuser makes -M on all the time
5
6Brad found that fuser had the -M option on all the time.
7A simple but significant typo caused this, thanks the the patch.
8
9Bug-Debian: http://bugs.debian.org/740275
10
11Upstream-Status: Backport
12
13Signed-off-by: Craig Small <csmall@enc.com.au>
14---
15 ChangeLog | 4 ++++
16 src/fuser.c | 2 +-
17 2 files changed, 5 insertions(+), 1 deletion(-)
18
19diff --git a/ChangeLog b/ChangeLog
20index fd1cccf..e5f784c 100644
21--- a/ChangeLog
22+++ b/ChangeLog
23@@ -1,3 +1,7 @@
24+Changes in 22.22
25+================
26+ * Fixed typo in fuser which has -M on Debian #740275
27+
28 Changes in 22.21
29 ================
30 * Missing comma in fuser(1) added Debian #702391
31diff --git a/src/fuser.c b/src/fuser.c
32index b485f65..389b302 100644
33--- a/src/fuser.c
34+++ b/src/fuser.c
35@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
36 usage(_("No process specification given"));
37
38 /* Check if -M flag was used and if so check mounts */
39- if (opts * OPT_ISMOUNTPOINT) {
40+ if (opts & OPT_ISMOUNTPOINT) {
41 check_mountpoints(&mounts, &names_head, &names_tail);
42 }
43
44--
451.8.4.2
46
diff --git a/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch b/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch
new file mode 100644
index 0000000000..c0835e041e
--- /dev/null
+++ b/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch
@@ -0,0 +1,29 @@
1From aa66afecd8ba9cc4139f25ab15ec315173413a7d Mon Sep 17 00:00:00 2001
2From: Paul Barker <paul@paulbarker.me.uk>
3Date: Wed, 20 Aug 2014 10:31:37 +0000
4Subject: [PATCH] Include <limits.h> for PATH_MAX
5
6When building against musl libc, PATH_MAX is defined in <limits.h>.
7
8Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
9
10Upstream-status: Accepted (Should be in next release after 22.21)
11---
12 src/pstree.c | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/src/pstree.c b/src/pstree.c
16index 071e6c4..0d28260 100644
17--- a/src/pstree.c
18+++ b/src/pstree.c
19@@ -41,6 +41,7 @@
20 #include <sys/types.h>
21 #include <sys/stat.h>
22 #include <sys/ioctl.h>
23+#include <limits.h>
24
25 #include "i18n.h"
26 #include "comm.h"
27--
282.0.4
29
diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc
new file mode 100644
index 0000000000..68e06561f9
--- /dev/null
+++ b/meta/recipes-extended/psmisc/psmisc.inc
@@ -0,0 +1,44 @@
1SUMMARY = "Utilities for managing processes on your system"
2DESCRIPTION = "The psmisc package contains utilities for managing processes on your \
3system: pstree, killall and fuser. The pstree command displays a tree \
4structure of all of the running processes on your system. The killall \
5command sends a specified signal (SIGTERM if nothing is specified) to \
6processes identified by name. The fuser command identifies the PIDs \
7of processes that are using specified files or filesystems."
8SECTION = "base"
9DEPENDS = "ncurses virtual/libintl"
10LICENSE = "GPLv2"
11
12SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz"
13
14S = "${WORKDIR}/psmisc-${PV}"
15
16inherit autotools gettext
17
18ALLOW_EMPTY_${PN} = "1"
19
20PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc"
21PACKAGES += "psmisc-extras"
22
23FILES_${PN} = ""
24RDEPENDS_${PN} = "fuser killall pstree"
25
26FILES_fuser = "${bindir}/fuser.${BPN}"
27FILES_fuser-doc = "${mandir}/man1/fuser*"
28
29FILES_killall = "${bindir}/killall.${BPN}"
30FILES_killall-doc = "${mandir}/man1/killall*"
31
32FILES_pstree = "${bindir}/pstree"
33FILES_pstree-doc = "${mandir}/man1/pstree*"
34
35FILES_psmisc-extras = "${bindir}"
36FILES_psmisc-extras-doc = "${mandir}"
37
38inherit update-alternatives
39
40ALTERNATIVE_PRIORITY = "90"
41
42ALTERNATIVE_killall = "killall"
43
44ALTERNATIVE_fuser = "fuser"
diff --git a/meta/recipes-extended/psmisc/psmisc_22.21.bb b/meta/recipes-extended/psmisc/psmisc_22.21.bb
new file mode 100644
index 0000000000..66aba9ec57
--- /dev/null
+++ b/meta/recipes-extended/psmisc/psmisc_22.21.bb
@@ -0,0 +1,10 @@
1require psmisc.inc
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
4
5SRC_URI[md5sum] = "935c0fd6eb208288262b385fa656f1bf"
6SRC_URI[sha256sum] = "97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a"
7
8SRC_URI += "file://0001-Typo-in-fuser-makes-M-on-all-the-time.patch \
9 file://0002-Include-limits.h-for-PATH_MAX.patch \
10 "