diff options
Diffstat (limited to 'meta')
| -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 b57a006bc67..ca13bdbd151 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 @@ -From 5dc872bb2fba6421cb8e1ee578f7bd4aaed55f61 Mon Sep 17 00:00:00 2001 +From 115fcf1daff18aa2f2e130d63704f04031878db0 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 24 Mar 2016 15:46:14 +0000 Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE @@ -7,14 +7,13 @@ Do not include sys/user.h since it conflicts with pt_regs struct from kernel APIs in asm/ptrace.h Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- Upstream-Status: Pending - +--- src/peekfd.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/peekfd.c b/src/peekfd.c -index cba2130..0d39878 100644 +index 5aa990a..7e8e3fc 100644 --- a/src/peekfd.c +++ b/src/peekfd.c @@ -30,8 +30,11 @@ @@ -28,8 +27,8 @@ index cba2130..0d39878 100644 +#include <stdint.h> #include <getopt.h> #include <ctype.h> - -@@ -228,11 +231,11 @@ int main(int argc, char **argv) + #include <dirent.h> +@@ -266,11 +269,11 @@ int main(int argc, char **argv) if (WIFSTOPPED(status)) { #ifdef PPC struct pt_regs regs; @@ -46,6 +45,3 @@ index cba2130..0d39878 100644 #elif defined(ARM) struct pt_regs regs; ptrace(PTRACE_GETREGS, pid, 0, ®s); --- -1.9.1 - diff --git a/meta/recipes-extended/psmisc/psmisc_23.1.bb b/meta/recipes-extended/psmisc/psmisc_23.2.bb index f07c9db1e7e..38e0a440587 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 \ file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ file://0001-Makefile.am-create-src-directory-before-attempting-t.patch \ " -SRCREV = "bd952b3063f2466ecab4ec093026cf0c4ce373c7" +SRCREV = "44eab9a3a63394eae6b79a7ef0a042f57e0c8a8f" S = "${WORKDIR}/git" |