From df7a2a50b20fcbae17b87d0291cbc405b04c37d7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 22 Nov 2018 16:41:31 +0100 Subject: psmisc: update to 23.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch | 14 +++++--------- meta/recipes-extended/psmisc/psmisc_23.1.bb | 10 ---------- meta/recipes-extended/psmisc/psmisc_23.2.bb | 10 ++++++++++ 3 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 meta/recipes-extended/psmisc/psmisc_23.1.bb create mode 100644 meta/recipes-extended/psmisc/psmisc_23.2.bb (limited to 'meta/recipes-extended') 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 @@ -From 5dc872bb2fba6421cb8e1ee578f7bd4aaed55f61 Mon Sep 17 00:00:00 2001 +From 115fcf1daff18aa2f2e130d63704f04031878db0 Mon Sep 17 00:00:00 2001 From: Khem Raj 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 ---- 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 #include #include - -@@ -228,11 +231,11 @@ int main(int argc, char **argv) + #include +@@ -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.1.bb deleted file mode 100644 index f07c9db1e7..0000000000 --- a/meta/recipes-extended/psmisc/psmisc_23.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require psmisc.inc -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -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" -S = "${WORKDIR}/git" diff --git a/meta/recipes-extended/psmisc/psmisc_23.2.bb b/meta/recipes-extended/psmisc/psmisc_23.2.bb new file mode 100644 index 0000000000..38e0a44058 --- /dev/null +++ b/meta/recipes-extended/psmisc/psmisc_23.2.bb @@ -0,0 +1,10 @@ +require psmisc.inc +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +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 = "44eab9a3a63394eae6b79a7ef0a042f57e0c8a8f" +S = "${WORKDIR}/git" -- cgit 1.2.3-korg