diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2020-02-06 19:18:12 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-08 13:19:56 +0000 |
| commit | c3df7eec1ba99a34b4037da786863de87073576d (patch) | |
| tree | 5b165ee80f100b1ff74a65b98cdc47b4cf1f8062 /meta/recipes-extended/procps | |
| parent | fb33127de5d80f5bcb84edf6cf4007bca73fa863 (diff) | |
| download | openembedded-core-contrib-c3df7eec1ba99a34b4037da786863de87073576d.tar.gz | |
procps: upgrade 3.3.15 -> 3.3.16
Drop 0001-Fix-out-of-tree-builds.patch since it has been merged
upstream.
Signed-off-by: Yi Zhao <yi.zhao@windriver.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.patch | 24 | ||||
| -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 @@ -From 0825db94fc91fa2150c0e649e92cc8dcc44f4b38 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 4 Apr 2018 14:09:45 +0300 -Subject: [PATCH] Fix out of tree builds - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - include/nls.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/nls.h b/include/nls.h -index 1166b7b..f5abe05 100644 ---- a/include/nls.h -+++ b/include/nls.h -@@ -6,7 +6,7 @@ - #define PROCPS_NG_NLS_H - - /* programs issuing textdomain() need PACKAGE string */ --#include "../config.h" -+#include "config.h" - - /* programs issuing bindtextdomain() also need LOCALEDIR string */ - #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 SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \ file://sysctl.conf \ - file://0001-Fix-out-of-tree-builds.patch \ " -SRC_URI[md5sum] = "2b0717a7cb474b3d6dfdeedfbad2eccc" -SRC_URI[sha256sum] = "10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465" +SRC_URI[md5sum] = "e8dc8455e573bdc40b8381d572bbb89b" +SRC_URI[sha256sum] = "925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af" S = "${WORKDIR}/procps-ng-${PV}" |