diff options
Diffstat (limited to 'external/poky/meta/recipes-extended/psmisc/psmisc')
2 files changed, 5 insertions, 39 deletions
diff --git a/external/poky/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch b/external/poky/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch deleted file mode 100644 index 4d44495f..00000000 --- a/external/poky/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 285877b7761d74736aca2687ed9bef2f78b82c33 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 2 Nov 2017 16:21:22 +0200 -Subject: [PATCH] Makefile.am: create src directory before attempting to write - there - -Otherwise out of tree builds will fail. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 9f61ab4..b4ced7f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -79,7 +79,7 @@ EXTRA_DIST = src/signames.c README.md - CLEANFILES = src/signames.h - - src/signames.h: src/signames.c Makefile -- export LC_ALL=C ; \ -+ export LC_ALL=C ; mkdir -p src ; \ - @CPP@ -dM $< |\ - tr -s '\t ' ' ' | sort -n -k 3 | sed \ - 's:#define SIG\([A-Z][A-Z]*[0-9]*\) \([0-9][0-9]*\).*$\:{\ \2,"\1" },:p;d' | \ --- -2.14.2 - diff --git a/external/poky/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch b/external/poky/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch index b57a006b..ca13bdbd 100644 --- a/external/poky/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch +++ b/external/poky/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 - |