Re: [OE-core] [PATCH] strace: Update to 5.5
On Thu, Feb 13, 2020 at 4:24 PM akuster808 wrote: > > > > On 2/13/20 3:25 PM, Alistair Francis wrote: > > Update strace to 5.5. This includes a small change in the license file > > to change the date to 2020. > > Have you run the ptests for this? I haven't. > Will this help help address this following open defect? > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13785 I'm not sure. Alistair > > - armin > > > Signed-off-by: Alistair Francis > > --- > > ...0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +- > > ...yscall_info-to-__ptrace_syscall_info.patch | 52 --- > > .../strace/strace/Makefile-ptest.patch| 6 ++- > > .../strace/disable-git-version-gen.patch | 4 +- > > .../strace/strace/mips-SIGEMT.patch | 2 +- > > ...st-test-for-m32-mx32-compile-support.patch | 43 --- > > .../strace/strace/ptest-spacesave.patch | 17 -- > > .../strace/strace/sys_headers.patch | 25 - > > .../strace/strace/uintptr_t.patch | 12 - > > .../strace/strace/update-gawk-paths.patch | 2 +- > > .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 ++-- > > 11 files changed, 36 insertions(+), 138 deletions(-) > > delete mode 100644 > > meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > > delete mode 100644 > > meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch > > delete mode 100644 meta/recipes-devtools/strace/strace/sys_headers.patch > > rename meta/recipes-devtools/strace/{strace_5.4.bb => strace_5.5.bb} (80%) > > > > diff --git > > a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > > > > b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > > index 52d2cdcdc5..235e803641 100644 > > --- > > a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > > +++ > > b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > > @@ -1,4 +1,4 @@ > > -From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001 > > +From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 > > From: Robert Yang > > Date: Thu, 9 Feb 2017 01:27:49 -0800 > > Subject: [PATCH] caps-abbrev.awk: fix gawk's path > > diff --git > > a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > > > > b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > > deleted file mode 100644 > > index dd0617a15f..00 > > --- > > a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > > +++ /dev/null > > @@ -1,52 +0,0 @@ > > -From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001 > > -From: Khem Raj > > -Date: Sat, 21 Dec 2019 10:18:38 -0800 > > -Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info > > - > > -glibc 2.31+ has defined __ptrace_syscall_info [1] > > - > > -[1] > > https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7 > > - > > -Upstream-Status: Pending > > -Signed-off-by: Khem Raj > > > > - get_personality.h | 2 ++ > > - ptrace.h | 2 ++ > > - 2 files changed, 4 insertions(+) > > - > > a/get_personality.h > > -+++ b/get_personality.h > > -@@ -10,7 +10,9 @@ > > - > > - # include "ptrace.h" > > - > > -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO > > - extern int > > - get_personality_from_syscall_info(const struct ptrace_syscall_info *); > > -+# endif > > - > > - #endif /* !STRACE_GET_PERSONALITY_H */ > > a/ptrace.h > > -+++ b/ptrace.h > > -@@ -186,6 +186,9 @@ struct ptrace_syscall_info { > > - }; > > - # endif > > - > > -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO > > -+# define ptrace_syscall_info __ptrace_syscall_info > > -+# endif > > - # if !HAVE_DECL_PTRACE_PEEKUSER > > - # define PTRACE_PEEKUSER PTRACE_PEEKUSR > > - # endif > > a/configure.ac > > -+++ b/configure.ac > > -@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n > > - AC_CHECK_TYPES(m4_normalize([ > > - struct pt_all_user_regs, > > - struct ia64_fpreg, > > --struct ptrace_peeksiginfo_args > > -+struct ptrace_peeksiginfo_args, > > -+struct __ptrace_syscall_info > > - ]),,, [#include ]) > > - > > - # For kernels that do not have v3.10-rc1~201^2~11 > > diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > > b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > > index 1f01ef79f2..42c1893f39 100644 > > --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > > +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > > @@ -1,4 +1,4 @@ > > -From ef5040b4f15006a22ac63a3bacfceac36ffc2045 Mon Sep 17 00:00:00 2001 > > +From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 > > From: Gabriel Barbu > >
Re: [OE-core] [PATCH] strace: Update to 5.5
On 2/13/20 3:25 PM, Alistair Francis wrote: > Update strace to 5.5. This includes a small change in the license file > to change the date to 2020. Have you run the ptests for this? Will this help help address this following open defect? https://bugzilla.yoctoproject.org/show_bug.cgi?id=13785 - armin > Signed-off-by: Alistair Francis > --- > ...0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +- > ...yscall_info-to-__ptrace_syscall_info.patch | 52 --- > .../strace/strace/Makefile-ptest.patch| 6 ++- > .../strace/disable-git-version-gen.patch | 4 +- > .../strace/strace/mips-SIGEMT.patch | 2 +- > ...st-test-for-m32-mx32-compile-support.patch | 43 --- > .../strace/strace/ptest-spacesave.patch | 17 -- > .../strace/strace/sys_headers.patch | 25 - > .../strace/strace/uintptr_t.patch | 12 - > .../strace/strace/update-gawk-paths.patch | 2 +- > .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 ++-- > 11 files changed, 36 insertions(+), 138 deletions(-) > delete mode 100644 > meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > delete mode 100644 > meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch > delete mode 100644 meta/recipes-devtools/strace/strace/sys_headers.patch > rename meta/recipes-devtools/strace/{strace_5.4.bb => strace_5.5.bb} (80%) > > diff --git > a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > > b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > index 52d2cdcdc5..235e803641 100644 > --- > a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > +++ > b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > @@ -1,4 +1,4 @@ > -From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001 > +From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 > From: Robert Yang > Date: Thu, 9 Feb 2017 01:27:49 -0800 > Subject: [PATCH] caps-abbrev.awk: fix gawk's path > diff --git > a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > > b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > deleted file mode 100644 > index dd0617a15f..00 > --- > a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001 > -From: Khem Raj > -Date: Sat, 21 Dec 2019 10:18:38 -0800 > -Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info > - > -glibc 2.31+ has defined __ptrace_syscall_info [1] > - > -[1] > https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7 > - > -Upstream-Status: Pending > -Signed-off-by: Khem Raj > > - get_personality.h | 2 ++ > - ptrace.h | 2 ++ > - 2 files changed, 4 insertions(+) > - > a/get_personality.h > -+++ b/get_personality.h > -@@ -10,7 +10,9 @@ > - > - # include "ptrace.h" > - > -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO > - extern int > - get_personality_from_syscall_info(const struct ptrace_syscall_info *); > -+# endif > - > - #endif /* !STRACE_GET_PERSONALITY_H */ > a/ptrace.h > -+++ b/ptrace.h > -@@ -186,6 +186,9 @@ struct ptrace_syscall_info { > - }; > - # endif > - > -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO > -+# define ptrace_syscall_info __ptrace_syscall_info > -+# endif > - # if !HAVE_DECL_PTRACE_PEEKUSER > - # define PTRACE_PEEKUSER PTRACE_PEEKUSR > - # endif > a/configure.ac > -+++ b/configure.ac > -@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n > - AC_CHECK_TYPES(m4_normalize([ > - struct pt_all_user_regs, > - struct ia64_fpreg, > --struct ptrace_peeksiginfo_args > -+struct ptrace_peeksiginfo_args, > -+struct __ptrace_syscall_info > - ]),,, [#include ]) > - > - # For kernels that do not have v3.10-rc1~201^2~11 > diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > index 1f01ef79f2..42c1893f39 100644 > --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > @@ -1,4 +1,4 @@ > -From ef5040b4f15006a22ac63a3bacfceac36ffc2045 Mon Sep 17 00:00:00 2001 > +From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 > From: Gabriel Barbu > Date: Thu, 25 Jul 2013 15:28:33 +0200 > Subject: [PATCH] strace: Add ptest > @@ -13,6 +13,8 @@ Signed-off-by: Anuj Mittal > tests/Makefile.am | 19 +++ > 1 file changed, 19 insertions(+) > > +diff --git a/tests/Makefile.am b/tests/Makefile.am > +index 8cf4c36..66162eb 100644 > --- a/tests/Makefil
[OE-core] [PATCH] strace: Update to 5.5
Update strace to 5.5. This includes a small change in the license file to change the date to 2020. Signed-off-by: Alistair Francis --- ...0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +- ...yscall_info-to-__ptrace_syscall_info.patch | 52 --- .../strace/strace/Makefile-ptest.patch| 6 ++- .../strace/disable-git-version-gen.patch | 4 +- .../strace/strace/mips-SIGEMT.patch | 2 +- ...st-test-for-m32-mx32-compile-support.patch | 43 --- .../strace/strace/ptest-spacesave.patch | 17 -- .../strace/strace/sys_headers.patch | 25 - .../strace/strace/uintptr_t.patch | 12 - .../strace/strace/update-gawk-paths.patch | 2 +- .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 ++-- 11 files changed, 36 insertions(+), 138 deletions(-) delete mode 100644 meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch delete mode 100644 meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch delete mode 100644 meta/recipes-devtools/strace/strace/sys_headers.patch rename meta/recipes-devtools/strace/{strace_5.4.bb => strace_5.5.bb} (80%) diff --git a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch index 52d2cdcdc5..235e803641 100644 --- a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch +++ b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch @@ -1,4 +1,4 @@ -From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001 +From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 9 Feb 2017 01:27:49 -0800 Subject: [PATCH] caps-abbrev.awk: fix gawk's path diff --git a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch deleted file mode 100644 index dd0617a15f..00 --- a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 21 Dec 2019 10:18:38 -0800 -Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info - -glibc 2.31+ has defined __ptrace_syscall_info [1] - -[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7 - -Upstream-Status: Pending -Signed-off-by: Khem Raj - get_personality.h | 2 ++ - ptrace.h | 2 ++ - 2 files changed, 4 insertions(+) - a/get_personality.h -+++ b/get_personality.h -@@ -10,7 +10,9 @@ - - # include "ptrace.h" - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO - extern int - get_personality_from_syscall_info(const struct ptrace_syscall_info *); -+# endif - - #endif /* !STRACE_GET_PERSONALITY_H */ a/ptrace.h -+++ b/ptrace.h -@@ -186,6 +186,9 @@ struct ptrace_syscall_info { - }; - # endif - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO -+# define ptrace_syscall_info __ptrace_syscall_info -+# endif - # if !HAVE_DECL_PTRACE_PEEKUSER - # define PTRACE_PEEKUSER PTRACE_PEEKUSR - # endif a/configure.ac -+++ b/configure.ac -@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n - AC_CHECK_TYPES(m4_normalize([ - struct pt_all_user_regs, - struct ia64_fpreg, -- struct ptrace_peeksiginfo_args -+ struct ptrace_peeksiginfo_args, -+ struct __ptrace_syscall_info - ]),,, [#include ]) - - # For kernels that do not have v3.10-rc1~201^2~11 diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 1f01ef79f2..42c1893f39 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,4 +1,4 @@ -From ef5040b4f15006a22ac63a3bacfceac36ffc2045 Mon Sep 17 00:00:00 2001 +From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 From: Gabriel Barbu Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest @@ -13,6 +13,8 @@ Signed-off-by: Anuj Mittal tests/Makefile.am | 19 +++ 1 file changed, 19 insertions(+) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 8cf4c36..66162eb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ @@ -23,7 +25,7 @@ Signed-off-by: Anuj Mittal AM_CFLAGS = $(WARN_CFLAGS) AM_CPPFLAGS = $(ARCH_MFLAGS) \ -I$(builddir) \ -@@ -531,3 +532,21 @@ BUILT_SOURCES = ksysent.h +@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h include ../scno.am diff --git a/meta/recipes-devtools/strace/strace/disable-git-version-g