diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/procps/procps/fix-configure.patch | 19 | ||||
-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 | |||
2 | exec_prefix is /usr default in OE-Core | ||
3 | |||
4 | Upstream-Status: Inappropriate [embedded specific] | ||
5 | |||
6 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
7 | Index: 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" | |||
13 | inherit autotools gettext pkgconfig update-alternatives | 13 | inherit autotools gettext pkgconfig update-alternatives |
14 | 14 | ||
15 | SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \ | 15 | SRC_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 | ||
20 | SRC_URI[md5sum] = "1fb7f3f6bf92ce6c5c9ed9949ae858fe" | 19 | SRC_URI[md5sum] = "6cc5b94c1c5b8cbc89ad345a7b522f74" |
21 | SRC_URI[sha256sum] = "a02e6f98974dfceab79884df902ca3df30b0e9bad6d76aee0fb5dce17f267f04" | 20 | SRC_URI[sha256sum] = "e9493169a2d2adc0bc045538707310c8e877b385e4e296143b62607d2bb044ed" |
22 | 21 | ||
23 | S = "${WORKDIR}/procps-ng-${PV}" | 22 | S = "${WORKDIR}/procps-ng-${PV}" |
24 | 23 | ||