diff options
Diffstat (limited to 'meta/recipes-devtools/strace/strace')
3 files changed, 30 insertions, 61 deletions
diff --git a/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch b/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch deleted file mode 100644 index 1985d8104d..0000000000 --- a/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 07f71a12cb88919c6113284fc43bf4967e5e2bc1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 28 Jun 2017 11:36:57 -0700 -Subject: [PATCH 8/8] replace struct ucontext with ucontext_t - -glibc >= 2.26 has dropped the tag struct ucontext -from ucontext_t type - -Upstream-Status: Submitted - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - linux/arm/arch_sigreturn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linux/arm/arch_sigreturn.c b/linux/arm/arch_sigreturn.c -index b60dad8..a2b7100 100644 ---- a/linux/arm/arch_sigreturn.c -+++ b/linux/arm/arch_sigreturn.c -@@ -9,7 +9,7 @@ arch_sigreturn(struct tcb *tcp) - #ifdef AARCH64 - tcp->currpers == 0 ? - (*aarch64_sp_ptr + SIZEOF_STRUCT_SIGINFO + -- offsetof(struct ucontext, uc_sigmask)) : -+ offsetof(ucontext_t, uc_sigmask)) : - #endif - (*arm_sp_ptr + - OFFSETOF_STRUCT_UCONTEXT_UC_SIGMASK); --- -2.13.2 - diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 07ea0b37f2..97bcc90a88 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -51,7 +51,7 @@ index 5aa7f89..a55a355 100644 + install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \ + sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ + done -+ for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done ++ for i in net scm_rights-fd rt_sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done -- 2.13.2 diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index 94ee53c7fc..f6ffa8e7a8 100644 --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch @@ -12,20 +12,20 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Andre McCurdy <armccurdy@gmail.com> --- - mpers.awk | 2 +- - tests-m32/caps.awk | 2 +- - tests-m32/match.awk | 2 +- - tests-m32/sigaction.awk | 2 +- - tests-mx32/caps.awk | 2 +- - tests-mx32/match.awk | 2 +- - tests-mx32/sigaction.awk | 2 +- - tests/caps.awk | 2 +- - tests/match.awk | 2 +- - tests/sigaction.awk | 2 +- + mpers.awk | 2 +- + tests-m32/caps.awk | 2 +- + tests-m32/match.awk | 2 +- + tests-m32/rt_sigaction.awk | 2 +- + tests-mx32/caps.awk | 2 +- + tests-mx32/match.awk | 2 +- + tests-mx32/rt_sigaction.awk | 2 +- + tests/caps.awk | 2 +- + tests/match.awk | 2 +- + tests/rt_sigaction.awk | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mpers.awk b/mpers.awk -index 99248c5..ff10520 100644 +index fe54763..b5238a8 100644 --- a/mpers.awk +++ b/mpers.awk @@ -1,4 +1,4 @@ @@ -35,7 +35,7 @@ index 99248c5..ff10520 100644 # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com> # Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org> diff --git a/tests-m32/caps.awk b/tests-m32/caps.awk -index 67003ac..a66f1f0 100644 +index c6e31ef..5efc6cc 100644 --- a/tests-m32/caps.awk +++ b/tests-m32/caps.awk @@ -1,4 +1,4 @@ @@ -54,18 +54,18 @@ index abfbae9..f2740bf 100644 # # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> # All rights reserved. -diff --git a/tests-m32/sigaction.awk b/tests-m32/sigaction.awk -index 5c6b6d0..3e14464 100644 ---- a/tests-m32/sigaction.awk -+++ b/tests-m32/sigaction.awk +diff --git a/tests-m32/rt_sigaction.awk b/tests-m32/rt_sigaction.awk +index 9c3a9ed..8414243 100644 +--- a/tests-m32/rt_sigaction.awk ++++ b/tests-m32/rt_sigaction.awk @@ -1,4 +1,4 @@ -#!/bin/gawk +#!/usr/bin/gawk # # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> - # All rights reserved. + # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> diff --git a/tests-mx32/caps.awk b/tests-mx32/caps.awk -index 67003ac..a66f1f0 100644 +index c6e31ef..5efc6cc 100644 --- a/tests-mx32/caps.awk +++ b/tests-mx32/caps.awk @@ -1,4 +1,4 @@ @@ -84,18 +84,18 @@ index abfbae9..f2740bf 100644 # # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> # All rights reserved. -diff --git a/tests-mx32/sigaction.awk b/tests-mx32/sigaction.awk -index 5c6b6d0..3e14464 100644 ---- a/tests-mx32/sigaction.awk -+++ b/tests-mx32/sigaction.awk +diff --git a/tests-mx32/rt_sigaction.awk b/tests-mx32/rt_sigaction.awk +index 9c3a9ed..8414243 100644 +--- a/tests-mx32/rt_sigaction.awk ++++ b/tests-mx32/rt_sigaction.awk @@ -1,4 +1,4 @@ -#!/bin/gawk +#!/usr/bin/gawk # # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> - # All rights reserved. + # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> diff --git a/tests/caps.awk b/tests/caps.awk -index 67003ac..a66f1f0 100644 +index c6e31ef..5efc6cc 100644 --- a/tests/caps.awk +++ b/tests/caps.awk @@ -1,4 +1,4 @@ @@ -114,13 +114,13 @@ index abfbae9..f2740bf 100644 # # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> # All rights reserved. -diff --git a/tests/sigaction.awk b/tests/sigaction.awk -index 5c6b6d0..3e14464 100644 ---- a/tests/sigaction.awk -+++ b/tests/sigaction.awk +diff --git a/tests/rt_sigaction.awk b/tests/rt_sigaction.awk +index 9c3a9ed..8414243 100644 +--- a/tests/rt_sigaction.awk ++++ b/tests/rt_sigaction.awk @@ -1,4 +1,4 @@ -#!/bin/gawk +#!/usr/bin/gawk # # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> - # All rights reserved. + # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> |