From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 18/27] psmisc: update to 23.0
Date: Tue, 14 Nov 2017 16:57:45 +0200 [thread overview]
Message-ID: <20171114145754.9643-18-alexander.kanavin@linux.intel.com> (raw)
In-Reply-To: <20171114145754.9643-1-alexander.kanavin@linux.intel.com>
Switch to gitlab, as that's where development now happens.
Drop two upstreamed patches, add two patches to avoid newly
introduced build errors.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
...001-Typo-in-fuser-makes-M-on-all-the-time.patch | 46 ----------------------
.../files/0002-Include-limits.h-for-PATH_MAX.patch | 29 --------------
...-create-src-directory-before-attempting-t.patch | 30 ++++++++++++++
...efile.am-do-not-recurse-into-po-directory.patch | 30 ++++++++++++++
meta/recipes-extended/psmisc/psmisc_22.21.bb | 12 ------
meta/recipes-extended/psmisc/psmisc_23.0.bb | 11 ++++++
6 files changed, 71 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
create mode 100644 meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-do-not-recurse-into-po-directory.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 e57d60f6a34..00000000000
--- 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 <anomie@users.sourceforge.net>
-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 <csmall@enc.com.au>
----
- 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 c8afcac8a8b..00000000000
--- 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 <paul@paulbarker.me.uk>
-Date: Wed, 20 Aug 2014 10:31:37 +0000
-Subject: [PATCH] Include <limits.h> for PATH_MAX
-
-When building against musl libc, PATH_MAX is defined in <limits.h>.
-
-Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
-
-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 <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-+#include <limits.h>
-
- #include "i18n.h"
- #include "comm.h"
---
-2.0.4
-
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 00000000000..4d44495fd3f
--- /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 <alex.kanavin@gmail.com>
+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 <alex.kanavin@gmail.com>
+---
+ 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/0001-Makefile.am-do-not-recurse-into-po-directory.patch b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-do-not-recurse-into-po-directory.patch
new file mode 100644
index 00000000000..72f993a1702
--- /dev/null
+++ b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-do-not-recurse-into-po-directory.patch
@@ -0,0 +1,30 @@
+From bbd69f375a0eaeba3bfa17008f8ff41e836c1688 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 2 Nov 2017 16:39:59 +0200
+Subject: [PATCH] Makefile.am: do not recurse into po directory
+
+Some broken autoconf logic results in a missing Makefile - let's
+just skip the directory with translations, as users of psmisc are unlikely
+to need those anyway.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b4ced7f..0d343a6 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,7 +11,6 @@ ACLOCAL_AMFLAGS = -I m4
+
+ SUBDIRS = \
+ doc \
+- po \
+ icons \
+ testsuite
+
+--
+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 1c6473ebf43..00000000000
--- 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 00000000000..e036ae25508
--- /dev/null
+++ b/meta/recipes-extended/psmisc/psmisc_23.0.bb
@@ -0,0 +1,11 @@
+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 \
+ file://0001-Makefile.am-do-not-recurse-into-po-directory.patch \
+ "
+SRCREV = "67b1da268f4c0ce6859980e3dfcfaec5b2448e80"
+S = "${WORKDIR}/git"
--
2.15.0
next prev parent reply other threads:[~2017-11-14 14:58 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
2017-11-14 14:57 ` [PATCH 02/27] oe-core: take UPSTREAM_CHECK_COMMITS into use where possible Alexander Kanavin
2017-11-14 14:57 ` [PATCH 03/27] python-scons: fix upstream version check Alexander Kanavin
2017-11-14 14:57 ` [PATCH 04/27] i2c-tools: " Alexander Kanavin
2017-11-14 14:57 ` [PATCH 05/27] python3-pycairo: " Alexander Kanavin
2017-11-14 14:57 ` [PATCH 06/27] libcheck: " Alexander Kanavin
2017-11-14 14:57 ` [PATCH 07/27] rpm: upstream version is now known Alexander Kanavin
2017-11-14 14:57 ` [PATCH 08/27] glib-2.0: update to 2.54.2 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 09/27] glib-networking: update to 2.54.1 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 10/27] dtc: update to 1.4.5 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 11/27] libdnf: update to 0.11.1 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 12/27] librepo: update to 1.8.1 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 13/27] dnf: update to 2.7.5 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 14/27] gobject-introspection: update to 1.54.1 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 15/27] gstreamer1.0-plugins: disable introspection on mips64 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 16/27] gnome-desktop3: Update to 3.26.2 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 17/27] webkitgtk: update to 2.18.3 Alexander Kanavin
2017-11-14 14:57 ` Alexander Kanavin [this message]
2017-11-17 0:25 ` [PATCH 18/27] psmisc: update to 23.0 Burton, Ross
2017-11-17 0:35 ` Burton, Ross
2017-11-17 7:10 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 19/27] btrfs-tools: update to 4.13.3 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 20/27] expect: update to 5.45.3 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 21/27] libpciaccess: update to 0.14 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 22/27] icu: update to 60.1 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 23/27] harfbuzz: update to 1.7.0 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 24/27] lighttpd: update to 1.4.48 Alexander Kanavin
2017-11-14 18:29 ` Leonardo Sandoval
2017-11-15 10:12 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 25/27] libxslt: update to 1.1.32 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 26/27] ffmpeg: update to 3.4 Alexander Kanavin
2017-11-14 19:41 ` Khem Raj
2017-11-14 20:31 ` Leonardo Sandoval
2017-11-15 10:14 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 27/27] openssl: update to 1.0.2m, 1.1.0g Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171114145754.9643-18-alexander.kanavin@linux.intel.com \
--to=alexander.kanavin@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox