From 42d0699c19b935ce1553d5b88577e1231315d5cc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 14 Dec 2015 16:18:42 +0200 Subject: [PATCH] procps: update to 3.3.11 fix-configure.patch was fixing lines that have been removed upstream. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- .../procps/procps/fix-configure.patch | 19 ------------------- .../{procps_3.3.10.bb => procps_3.3.11.bb} | 5 ++--- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 meta/recipes-extended/procps/procps/fix-configure.patch rename meta/recipes-extended/procps/{procps_3.3.10.bb => procps_3.3.11.bb} (93%) 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 -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 similarity index 93% rename from meta/recipes-extended/procps/procps_3.3.10.bb rename to 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}" -- 2.40.1