summaryrefslogtreecommitdiff
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:11:25 +0000
commit42d0699c19b935ce1553d5b88577e1231315d5cc (patch)
treee9cd35d57b4f6ce9e62cc07f5aa10dfbf4212290
parent2b2a493baf45cbe5d53d8346525990f344e103c4 (diff)
downloadopenembedded-core-42d0699c19b935ce1553d5b88577e1231315d5cc.tar.gz
openembedded-core-42d0699c19b935ce1553d5b88577e1231315d5cc.tar.bz2
openembedded-core-42d0699c19b935ce1553d5b88577e1231315d5cc.zip
procps: update to 3.3.11
fix-configure.patch was fixing lines that have been removed upstream. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 @@
-
-exec_prefix is /usr default in OE-Core
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-Index: procps-ng-3.3.10/configure.ac
-===================================================================
---- procps-ng-3.3.10.orig/configure.ac
-+++ procps-ng-3.3.10/configure.ac
-@@ -70,7 +70,7 @@ AC_FUNC_MMAP
- AC_FUNC_REALLOC
- AC_FUNC_STRTOD
-
--usrbin_execdir='${exec_prefix}/usr/bin'
-+usrbin_execdir='${exec_prefix}/bin'
- AC_SUBST([usrbin_execdir])
-
- 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"
inherit autotools gettext pkgconfig update-alternatives
SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \
- file://fix-configure.patch \
file://sysctl.conf \
"
-SRC_URI[md5sum] = "1fb7f3f6bf92ce6c5c9ed9949ae858fe"
-SRC_URI[sha256sum] = "a02e6f98974dfceab79884df902ca3df30b0e9bad6d76aee0fb5dce17f267f04"
+SRC_URI[md5sum] = "6cc5b94c1c5b8cbc89ad345a7b522f74"
+SRC_URI[sha256sum] = "e9493169a2d2adc0bc045538707310c8e877b385e4e296143b62607d2bb044ed"
S = "${WORKDIR}/procps-ng-${PV}"