From dfda42b624b539125443f30ae3a587ae55691ba4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 2 Nov 2017 16:43:44 +0200 Subject: 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 Signed-off-by: Alexander Kanavin --- ...001-Typo-in-fuser-makes-M-on-all-the-time.patch | 46 ---------------------- .../files/0002-Include-limits.h-for-PATH_MAX.patch | 29 -------------- meta/recipes-extended/psmisc/psmisc.inc | 9 +++++ ...-create-src-directory-before-attempting-t.patch | 30 ++++++++++++++ meta/recipes-extended/psmisc/psmisc_22.21.bb | 12 ------ meta/recipes-extended/psmisc/psmisc_23.0.bb | 10 +++++ 6 files changed, 49 insertions(+), 87 deletions(-) delete mode 100644 meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch delete mode 100644 meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch create mode 100644 meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch delete mode 100644 meta/recipes-extended/psmisc/psmisc_22.21.bb create mode 100644 meta/recipes-extended/psmisc/psmisc_23.0.bb 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 @@ -From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001 -From: Brad Jorsch -Date: Fri, 28 Feb 2014 21:55:02 +1100 -Subject: [PATCH] Typo in fuser makes -M on all the time - -Brad found that fuser had the -M option on all the time. -A simple but significant typo caused this, thanks the the patch. - -Bug-Debian: http://bugs.debian.org/740275 - -Upstream-Status: Backport - -Signed-off-by: Craig Small ---- - ChangeLog | 4 ++++ - src/fuser.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index fd1cccf..e5f784c 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,7 @@ -+Changes in 22.22 -+================ -+ * Fixed typo in fuser which has -M on Debian #740275 -+ - Changes in 22.21 - ================ - * Missing comma in fuser(1) added Debian #702391 -diff --git a/src/fuser.c b/src/fuser.c -index b485f65..389b302 100644 ---- a/src/fuser.c -+++ b/src/fuser.c -@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[]) - usage(_("No process specification given")); - - /* Check if -M flag was used and if so check mounts */ -- if (opts * OPT_ISMOUNTPOINT) { -+ if (opts & OPT_ISMOUNTPOINT) { - check_mountpoints(&mounts, &names_head, &names_tail); - } - --- -1.8.4.2 - 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 @@ -From aa66afecd8ba9cc4139f25ab15ec315173413a7d Mon Sep 17 00:00:00 2001 -From: Paul Barker -Date: Wed, 20 Aug 2014 10:31:37 +0000 -Subject: [PATCH] Include for PATH_MAX - -When building against musl libc, PATH_MAX is defined in . - -Signed-off-by: Paul Barker - -Upstream-Status: Accepted (Should be in next release after 22.21) ---- - src/pstree.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/pstree.c b/src/pstree.c -index 071e6c4..0d28260 100644 ---- a/src/pstree.c -+++ b/src/pstree.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - - #include "i18n.h" - #include "comm.h" --- -2.0.4 - 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}" 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. +EXTRA_AUTORECONF="" +do_configure_prepend() { + ( cd ${S} && po/update-potfiles ) +} + + PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 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 @@ +From 285877b7761d74736aca2687ed9bef2f78b82c33 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 2 Nov 2017 16:21:22 +0200 +Subject: [PATCH] Makefile.am: create src directory before attempting to write + there + +Otherwise out of tree builds will fail. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 9f61ab4..b4ced7f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -79,7 +79,7 @@ EXTRA_DIST = src/signames.c README.md + CLEANFILES = src/signames.h + + src/signames.h: src/signames.c Makefile +- export LC_ALL=C ; \ ++ export LC_ALL=C ; mkdir -p src ; \ + @CPP@ -dM $< |\ + tr -s '\t ' ' ' | sort -n -k 3 | sed \ + 's:#define SIG\([A-Z][A-Z]*[0-9]*\) \([0-9][0-9]*\).*$\:{\ \2,"\1" },:p;d' | \ +-- +2.14.2 + 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 @@ -require psmisc.inc -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -SRC_URI[md5sum] = "935c0fd6eb208288262b385fa656f1bf" -SRC_URI[sha256sum] = "97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a" - -SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \ - file://0001-Typo-in-fuser-makes-M-on-all-the-time.patch \ - file://0002-Include-limits.h-for-PATH_MAX.patch \ - file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ - " 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 @@ +require psmisc.inc +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \ + file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ + file://0001-Makefile.am-create-src-directory-before-attempting-t.patch \ + " +SRCREV = "67b1da268f4c0ce6859980e3dfcfaec5b2448e80" +S = "${WORKDIR}/git" -- cgit 1.2.3-korg