summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/procps
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-05-04 15:32:40 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-08 16:14:14 +0100
commit4c52e22689c7d53349f5eff46afe693af978e7a4 (patch)
tree839c05c14bb298fa88bf53c50f83b0c12c1ffe1f /meta/recipes-extended/procps
parent23320a2c9a516cc15e8e9d740a4693486396986b (diff)
downloadpoky-4c52e22689c7d53349f5eff46afe693af978e7a4.tar.gz
procps: update to 3.3.14
(From OE-Core rev: c699a519c708bb7ab3035dfeb7ab8c1b4ecd349d) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/procps')
-rw-r--r--meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch24
-rw-r--r--meta/recipes-extended/procps/procps_3.3.14.bb (renamed from meta/recipes-extended/procps/procps_3.3.12.bb)7
2 files changed, 28 insertions, 3 deletions
diff --git a/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch b/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch
new file mode 100644
index 0000000000..e548194362
--- /dev/null
+++ b/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch
@@ -0,0 +1,24 @@
1From 0825db94fc91fa2150c0e649e92cc8dcc44f4b38 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 4 Apr 2018 14:09:45 +0300
4Subject: [PATCH] Fix out of tree builds
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 include/nls.h | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/include/nls.h b/include/nls.h
13index 1166b7b..f5abe05 100644
14--- a/include/nls.h
15+++ b/include/nls.h
16@@ -6,7 +6,7 @@
17 #define PROCPS_NG_NLS_H
18
19 /* programs issuing textdomain() need PACKAGE string */
20-#include "../config.h"
21+#include "config.h"
22
23 /* programs issuing bindtextdomain() also need LOCALEDIR string */
24 #ifndef LOCALEDIR
diff --git a/meta/recipes-extended/procps/procps_3.3.12.bb b/meta/recipes-extended/procps/procps_3.3.14.bb
index ecf215fecf..1aba511612 100644
--- a/meta/recipes-extended/procps/procps_3.3.12.bb
+++ b/meta/recipes-extended/procps/procps_3.3.14.bb
@@ -14,10 +14,11 @@ inherit autotools gettext pkgconfig update-alternatives
14 14
15SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \ 15SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \
16 file://sysctl.conf \ 16 file://sysctl.conf \
17 " 17 file://0001-Fix-out-of-tree-builds.patch \
18 "
18 19
19SRC_URI[md5sum] = "957e42e8b193490b2111252e4a2b443c" 20SRC_URI[md5sum] = "fce371ccc1c15a67af9d85e4057e559d"
20SRC_URI[sha256sum] = "6ed65ab86318f37904e8f9014415a098bec5bc53653e5d9ab404f95ca5e1a7d4" 21SRC_URI[sha256sum] = "5eda0253999b7d786e690edfa73301b3113c7a67058478866e98e9ff6736726c"
21 22
22S = "${WORKDIR}/procps-ng-${PV}" 23S = "${WORKDIR}/procps-ng-${PV}"
23 24