summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-11-02 16:43:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-18 18:03:56 +0000
commit1bdd2c423af9546080e8f2e15a4cd411346f57be (patch)
treebb8f8e9a5a767d821278965f0429be78eb02ef75 /meta
parentf83e0cb7f5e6b50356cc456f90cee471a5b7c39b (diff)
downloadpoky-1bdd2c423af9546080e8f2e15a4cd411346f57be.tar.gz
psmisc: update to 23.0
Switch to gitlab, as that's where development now happens. Drop two upstreamed patches, add apatches to avoid newly introduced build errors, and a gettext fix suggested here: http://lists.openembedded.org/pipermail/openembedded-core/2017-November/144566.html (From OE-Core rev: dfda42b624b539125443f30ae3a587ae55691ba4) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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.inc9
-rw-r--r--meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch30
-rw-r--r--meta/recipes-extended/psmisc/psmisc_22.21.bb12
-rw-r--r--meta/recipes-extended/psmisc/psmisc_23.0.bb10
6 files changed, 49 insertions, 87 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
deleted file mode 100644
index e57d60f6a3..0000000000
--- a/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
+++ /dev/null
@@ -1,46 +0,0 @@
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
deleted file mode 100644
index c8afcac8a8..0000000000
--- a/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch
+++ /dev/null
@@ -1,29 +0,0 @@
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
index 66a784b53c..527a1d590f 100644
--- a/meta/recipes-extended/psmisc/psmisc.inc
+++ b/meta/recipes-extended/psmisc/psmisc.inc
@@ -16,6 +16,15 @@ S = "${WORKDIR}/psmisc-${PV}"
16 16
17inherit autotools gettext 17inherit autotools gettext
18 18
19# Upstream has a custom autogen.sh which invokes po/update-potfiles as they
20# don't ship a po/POTFILES.in (which is silly). Without that file gettext
21#doesn't believe po/ is a gettext directory and won't generate po/Makefile.
22EXTRA_AUTORECONF=""
23do_configure_prepend() {
24 ( cd ${S} && po/update-potfiles )
25}
26
27
19PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" 28PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
20PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 29PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
21 30
diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch
new file mode 100644
index 0000000000..4d44495fd3
--- /dev/null
+++ b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch
@@ -0,0 +1,30 @@
1From 285877b7761d74736aca2687ed9bef2f78b82c33 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 2 Nov 2017 16:21:22 +0200
4Subject: [PATCH] Makefile.am: create src directory before attempting to write
5 there
6
7Otherwise out of tree builds will fail.
8
9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 Makefile.am | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/Makefile.am b/Makefile.am
16index 9f61ab4..b4ced7f 100644
17--- a/Makefile.am
18+++ b/Makefile.am
19@@ -79,7 +79,7 @@ EXTRA_DIST = src/signames.c README.md
20 CLEANFILES = src/signames.h
21
22 src/signames.h: src/signames.c Makefile
23- export LC_ALL=C ; \
24+ export LC_ALL=C ; mkdir -p src ; \
25 @CPP@ -dM $< |\
26 tr -s '\t ' ' ' | sort -n -k 3 | sed \
27 's:#define SIG\([A-Z][A-Z]*[0-9]*\) \([0-9][0-9]*\).*$\:{\ \2,"\1" },:p;d' | \
28--
292.14.2
30
diff --git a/meta/recipes-extended/psmisc/psmisc_22.21.bb b/meta/recipes-extended/psmisc/psmisc_22.21.bb
deleted file mode 100644
index 1c6473ebf4..0000000000
--- a/meta/recipes-extended/psmisc/psmisc_22.21.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require psmisc.inc
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
4
5SRC_URI[md5sum] = "935c0fd6eb208288262b385fa656f1bf"
6SRC_URI[sha256sum] = "97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a"
7
8SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
9 file://0001-Typo-in-fuser-makes-M-on-all-the-time.patch \
10 file://0002-Include-limits.h-for-PATH_MAX.patch \
11 file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
12 "
diff --git a/meta/recipes-extended/psmisc/psmisc_23.0.bb b/meta/recipes-extended/psmisc/psmisc_23.0.bb
new file mode 100644
index 0000000000..2b07f49741
--- /dev/null
+++ b/meta/recipes-extended/psmisc/psmisc_23.0.bb
@@ -0,0 +1,10 @@
1require psmisc.inc
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
4
5SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \
6 file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
7 file://0001-Makefile.am-create-src-directory-before-attempting-t.patch \
8 "
9SRCREV = "67b1da268f4c0ce6859980e3dfcfaec5b2448e80"
10S = "${WORKDIR}/git"