summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-12-14 16:18:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-16 12:12:18 +0000
commitd8608bc43400c973db78b022d85019068738a72f (patch)
tree889867bcac0b75b09cf8e9bd9fec5649d00daeb8
parent52f6a018b7c5e8e824579eda459bca4858f6e36a (diff)
downloadpoky-d8608bc43400c973db78b022d85019068738a72f.tar.gz
procps: update to 3.3.11
fix-configure.patch was fixing lines that have been removed upstream. (From OE-Core rev: 42d0699c19b935ce1553d5b88577e1231315d5cc) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/procps/procps/fix-configure.patch19
-rw-r--r--meta/recipes-extended/procps/procps_3.3.11.bb (renamed from meta/recipes-extended/procps/procps_3.3.10.bb)5
2 files changed, 2 insertions, 22 deletions
diff --git a/meta/recipes-extended/procps/procps/fix-configure.patch b/meta/recipes-extended/procps/procps/fix-configure.patch
deleted file mode 100644
index 934ae80954..0000000000
--- a/meta/recipes-extended/procps/procps/fix-configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1
2exec_prefix is /usr default in OE-Core
3
4Upstream-Status: Inappropriate [embedded specific]
5
6Signed-off-by: Saul Wold <sgw@linux.intel.com>
7Index: procps-ng-3.3.10/configure.ac
8===================================================================
9--- procps-ng-3.3.10.orig/configure.ac
10+++ procps-ng-3.3.10/configure.ac
11@@ -70,7 +70,7 @@ AC_FUNC_MMAP
12 AC_FUNC_REALLOC
13 AC_FUNC_STRTOD
14
15-usrbin_execdir='${exec_prefix}/usr/bin'
16+usrbin_execdir='${exec_prefix}/bin'
17 AC_SUBST([usrbin_execdir])
18
19 AM_GNU_GETTEXT_VERSION([0.14.1])
diff --git a/meta/recipes-extended/procps/procps_3.3.10.bb b/meta/recipes-extended/procps/procps_3.3.11.bb
index e474f5b5b4..c6dccc6774 100644
--- a/meta/recipes-extended/procps/procps_3.3.10.bb
+++ b/meta/recipes-extended/procps/procps_3.3.11.bb
@@ -13,12 +13,11 @@ DEPENDS = "ncurses"
13inherit autotools gettext pkgconfig update-alternatives 13inherit 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://fix-configure.patch \
17 file://sysctl.conf \ 16 file://sysctl.conf \
18 " 17 "
19 18
20SRC_URI[md5sum] = "1fb7f3f6bf92ce6c5c9ed9949ae858fe" 19SRC_URI[md5sum] = "6cc5b94c1c5b8cbc89ad345a7b522f74"
21SRC_URI[sha256sum] = "a02e6f98974dfceab79884df902ca3df30b0e9bad6d76aee0fb5dce17f267f04" 20SRC_URI[sha256sum] = "e9493169a2d2adc0bc045538707310c8e877b385e4e296143b62607d2bb044ed"
22 21
23S = "${WORKDIR}/procps-ng-${PV}" 22S = "${WORKDIR}/procps-ng-${PV}"
24 23