summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2020-02-06 19:18:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-08 13:20:02 +0000
commit9683f356f14ee6eacaf99f4a4783c86de5636d85 (patch)
tree7d32c26bde6e0c2b67b484066eb40499f9266d30
parentb7a5901dd6c7ffa1b277d216c9b684b06137d852 (diff)
downloadpoky-9683f356f14ee6eacaf99f4a4783c86de5636d85.tar.gz
procps: upgrade 3.3.15 -> 3.3.16
Drop 0001-Fix-out-of-tree-builds.patch since it has been merged upstream. (From OE-Core rev: c3df7eec1ba99a34b4037da786863de87073576d) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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.16.bb (renamed from meta/recipes-extended/procps/procps_3.3.15.bb)5
2 files changed, 2 insertions, 27 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
deleted file mode 100644
index e548194362..0000000000
--- a/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch
+++ /dev/null
@@ -1,24 +0,0 @@
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.15.bb b/meta/recipes-extended/procps/procps_3.3.16.bb
index 17abd96dca..60f90976bb 100644
--- a/meta/recipes-extended/procps/procps_3.3.15.bb
+++ b/meta/recipes-extended/procps/procps_3.3.16.bb
@@ -14,11 +14,10 @@ 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 file://0001-Fix-out-of-tree-builds.patch \
18 " 17 "
19 18
20SRC_URI[md5sum] = "2b0717a7cb474b3d6dfdeedfbad2eccc" 19SRC_URI[md5sum] = "e8dc8455e573bdc40b8381d572bbb89b"
21SRC_URI[sha256sum] = "10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465" 20SRC_URI[sha256sum] = "925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af"
22 21
23S = "${WORKDIR}/procps-ng-${PV}" 22S = "${WORKDIR}/procps-ng-${PV}"
24 23