diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-11-22 16:41:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-23 23:35:19 +0000 |
commit | 60973c804e562360084050395148d2f88cbadd32 (patch) | |
tree | 929c8beced649161d4aa492dd75dc7a937f4fe4d | |
parent | 26762b70b20a206c2a1840908338c851bed18d3e (diff) | |
download | poky-60973c804e562360084050395148d2f88cbadd32.tar.gz |
psmisc: update to 23.2
(From OE-Core rev: df7a2a50b20fcbae17b87d0291cbc405b04c37d7)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch | 14 | ||||
-rw-r--r-- | meta/recipes-extended/psmisc/psmisc_23.2.bb (renamed from meta/recipes-extended/psmisc/psmisc_23.1.bb) | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch b/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch index b57a006bc6..ca13bdbd15 100644 --- a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch +++ b/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5dc872bb2fba6421cb8e1ee578f7bd4aaed55f61 Mon Sep 17 00:00:00 2001 | 1 | From 115fcf1daff18aa2f2e130d63704f04031878db0 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 24 Mar 2016 15:46:14 +0000 | 3 | Date: Thu, 24 Mar 2016 15:46:14 +0000 |
4 | Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE | 4 | Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE |
@@ -7,14 +7,13 @@ Do not include sys/user.h since it conflicts with | |||
7 | pt_regs struct from kernel APIs in asm/ptrace.h | 7 | pt_regs struct from kernel APIs in asm/ptrace.h |
8 | 8 | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
10 | --- | ||
11 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
12 | 11 | --- | |
13 | src/peekfd.c | 13 ++++++++----- | 12 | src/peekfd.c | 13 ++++++++----- |
14 | 1 file changed, 8 insertions(+), 5 deletions(-) | 13 | 1 file changed, 8 insertions(+), 5 deletions(-) |
15 | 14 | ||
16 | diff --git a/src/peekfd.c b/src/peekfd.c | 15 | diff --git a/src/peekfd.c b/src/peekfd.c |
17 | index cba2130..0d39878 100644 | 16 | index 5aa990a..7e8e3fc 100644 |
18 | --- a/src/peekfd.c | 17 | --- a/src/peekfd.c |
19 | +++ b/src/peekfd.c | 18 | +++ b/src/peekfd.c |
20 | @@ -30,8 +30,11 @@ | 19 | @@ -30,8 +30,11 @@ |
@@ -28,8 +27,8 @@ index cba2130..0d39878 100644 | |||
28 | +#include <stdint.h> | 27 | +#include <stdint.h> |
29 | #include <getopt.h> | 28 | #include <getopt.h> |
30 | #include <ctype.h> | 29 | #include <ctype.h> |
31 | 30 | #include <dirent.h> | |
32 | @@ -228,11 +231,11 @@ int main(int argc, char **argv) | 31 | @@ -266,11 +269,11 @@ int main(int argc, char **argv) |
33 | if (WIFSTOPPED(status)) { | 32 | if (WIFSTOPPED(status)) { |
34 | #ifdef PPC | 33 | #ifdef PPC |
35 | struct pt_regs regs; | 34 | struct pt_regs regs; |
@@ -46,6 +45,3 @@ index cba2130..0d39878 100644 | |||
46 | #elif defined(ARM) | 45 | #elif defined(ARM) |
47 | struct pt_regs regs; | 46 | struct pt_regs regs; |
48 | ptrace(PTRACE_GETREGS, pid, 0, ®s); | 47 | ptrace(PTRACE_GETREGS, pid, 0, ®s); |
49 | -- | ||
50 | 1.9.1 | ||
51 | |||
diff --git a/meta/recipes-extended/psmisc/psmisc_23.1.bb b/meta/recipes-extended/psmisc/psmisc_23.2.bb index f07c9db1e7..38e0a44058 100644 --- a/meta/recipes-extended/psmisc/psmisc_23.1.bb +++ b/meta/recipes-extended/psmisc/psmisc_23.2.bb | |||
@@ -6,5 +6,5 @@ SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \ | |||
6 | file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ | 6 | file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ |
7 | file://0001-Makefile.am-create-src-directory-before-attempting-t.patch \ | 7 | file://0001-Makefile.am-create-src-directory-before-attempting-t.patch \ |
8 | " | 8 | " |
9 | SRCREV = "bd952b3063f2466ecab4ec093026cf0c4ce373c7" | 9 | SRCREV = "44eab9a3a63394eae6b79a7ef0a042f57e0c8a8f" |
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |