summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch31
-rw-r--r--meta/recipes-devtools/strace/strace/Makefile-ptest.patch2
-rw-r--r--meta/recipes-devtools/strace/strace/update-gawk-paths.patch58
-rw-r--r--meta/recipes-devtools/strace/strace_4.18.bb (renamed from meta/recipes-devtools/strace/strace_4.17.bb)7
4 files changed, 33 insertions, 65 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 @@
1From 07f71a12cb88919c6113284fc43bf4967e5e2bc1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 28 Jun 2017 11:36:57 -0700
4Subject: [PATCH 8/8] replace struct ucontext with ucontext_t
5
6glibc >= 2.26 has dropped the tag struct ucontext
7from ucontext_t type
8
9Upstream-Status: Submitted
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 linux/arm/arch_sigreturn.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/linux/arm/arch_sigreturn.c b/linux/arm/arch_sigreturn.c
17index b60dad8..a2b7100 100644
18--- a/linux/arm/arch_sigreturn.c
19+++ b/linux/arm/arch_sigreturn.c
20@@ -9,7 +9,7 @@ arch_sigreturn(struct tcb *tcp)
21 #ifdef AARCH64
22 tcp->currpers == 0 ?
23 (*aarch64_sp_ptr + SIZEOF_STRUCT_SIGINFO +
24- offsetof(struct ucontext, uc_sigmask)) :
25+ offsetof(ucontext_t, uc_sigmask)) :
26 #endif
27 (*arm_sp_ptr +
28 OFFSETOF_STRUCT_UCONTEXT_UC_SIGMASK);
29--
302.13.2
31
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
51+ install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \ 51+ install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \
52+ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ 52+ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \
53+ done 53+ done
54+ for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done 54+ for i in net scm_rights-fd rt_sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done
55-- 55--
562.13.2 562.13.2
57 57
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]
12 12
13Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 13Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
14--- 14---
15 mpers.awk | 2 +- 15 mpers.awk | 2 +-
16 tests-m32/caps.awk | 2 +- 16 tests-m32/caps.awk | 2 +-
17 tests-m32/match.awk | 2 +- 17 tests-m32/match.awk | 2 +-
18 tests-m32/sigaction.awk | 2 +- 18 tests-m32/rt_sigaction.awk | 2 +-
19 tests-mx32/caps.awk | 2 +- 19 tests-mx32/caps.awk | 2 +-
20 tests-mx32/match.awk | 2 +- 20 tests-mx32/match.awk | 2 +-
21 tests-mx32/sigaction.awk | 2 +- 21 tests-mx32/rt_sigaction.awk | 2 +-
22 tests/caps.awk | 2 +- 22 tests/caps.awk | 2 +-
23 tests/match.awk | 2 +- 23 tests/match.awk | 2 +-
24 tests/sigaction.awk | 2 +- 24 tests/rt_sigaction.awk | 2 +-
25 10 files changed, 10 insertions(+), 10 deletions(-) 25 10 files changed, 10 insertions(+), 10 deletions(-)
26 26
27diff --git a/mpers.awk b/mpers.awk 27diff --git a/mpers.awk b/mpers.awk
28index 99248c5..ff10520 100644 28index fe54763..b5238a8 100644
29--- a/mpers.awk 29--- a/mpers.awk
30+++ b/mpers.awk 30+++ b/mpers.awk
31@@ -1,4 +1,4 @@ 31@@ -1,4 +1,4 @@
@@ -35,7 +35,7 @@ index 99248c5..ff10520 100644
35 # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com> 35 # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com>
36 # Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org> 36 # Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
37diff --git a/tests-m32/caps.awk b/tests-m32/caps.awk 37diff --git a/tests-m32/caps.awk b/tests-m32/caps.awk
38index 67003ac..a66f1f0 100644 38index c6e31ef..5efc6cc 100644
39--- a/tests-m32/caps.awk 39--- a/tests-m32/caps.awk
40+++ b/tests-m32/caps.awk 40+++ b/tests-m32/caps.awk
41@@ -1,4 +1,4 @@ 41@@ -1,4 +1,4 @@
@@ -54,18 +54,18 @@ index abfbae9..f2740bf 100644
54 # 54 #
55 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> 55 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
56 # All rights reserved. 56 # All rights reserved.
57diff --git a/tests-m32/sigaction.awk b/tests-m32/sigaction.awk 57diff --git a/tests-m32/rt_sigaction.awk b/tests-m32/rt_sigaction.awk
58index 5c6b6d0..3e14464 100644 58index 9c3a9ed..8414243 100644
59--- a/tests-m32/sigaction.awk 59--- a/tests-m32/rt_sigaction.awk
60+++ b/tests-m32/sigaction.awk 60+++ b/tests-m32/rt_sigaction.awk
61@@ -1,4 +1,4 @@ 61@@ -1,4 +1,4 @@
62-#!/bin/gawk 62-#!/bin/gawk
63+#!/usr/bin/gawk 63+#!/usr/bin/gawk
64 # 64 #
65 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> 65 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
66 # All rights reserved. 66 # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com>
67diff --git a/tests-mx32/caps.awk b/tests-mx32/caps.awk 67diff --git a/tests-mx32/caps.awk b/tests-mx32/caps.awk
68index 67003ac..a66f1f0 100644 68index c6e31ef..5efc6cc 100644
69--- a/tests-mx32/caps.awk 69--- a/tests-mx32/caps.awk
70+++ b/tests-mx32/caps.awk 70+++ b/tests-mx32/caps.awk
71@@ -1,4 +1,4 @@ 71@@ -1,4 +1,4 @@
@@ -84,18 +84,18 @@ index abfbae9..f2740bf 100644
84 # 84 #
85 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> 85 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
86 # All rights reserved. 86 # All rights reserved.
87diff --git a/tests-mx32/sigaction.awk b/tests-mx32/sigaction.awk 87diff --git a/tests-mx32/rt_sigaction.awk b/tests-mx32/rt_sigaction.awk
88index 5c6b6d0..3e14464 100644 88index 9c3a9ed..8414243 100644
89--- a/tests-mx32/sigaction.awk 89--- a/tests-mx32/rt_sigaction.awk
90+++ b/tests-mx32/sigaction.awk 90+++ b/tests-mx32/rt_sigaction.awk
91@@ -1,4 +1,4 @@ 91@@ -1,4 +1,4 @@
92-#!/bin/gawk 92-#!/bin/gawk
93+#!/usr/bin/gawk 93+#!/usr/bin/gawk
94 # 94 #
95 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> 95 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
96 # All rights reserved. 96 # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com>
97diff --git a/tests/caps.awk b/tests/caps.awk 97diff --git a/tests/caps.awk b/tests/caps.awk
98index 67003ac..a66f1f0 100644 98index c6e31ef..5efc6cc 100644
99--- a/tests/caps.awk 99--- a/tests/caps.awk
100+++ b/tests/caps.awk 100+++ b/tests/caps.awk
101@@ -1,4 +1,4 @@ 101@@ -1,4 +1,4 @@
@@ -114,13 +114,13 @@ index abfbae9..f2740bf 100644
114 # 114 #
115 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> 115 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
116 # All rights reserved. 116 # All rights reserved.
117diff --git a/tests/sigaction.awk b/tests/sigaction.awk 117diff --git a/tests/rt_sigaction.awk b/tests/rt_sigaction.awk
118index 5c6b6d0..3e14464 100644 118index 9c3a9ed..8414243 100644
119--- a/tests/sigaction.awk 119--- a/tests/rt_sigaction.awk
120+++ b/tests/sigaction.awk 120+++ b/tests/rt_sigaction.awk
121@@ -1,4 +1,4 @@ 121@@ -1,4 +1,4 @@
122-#!/bin/gawk 122-#!/bin/gawk
123+#!/usr/bin/gawk 123+#!/usr/bin/gawk
124 # 124 #
125 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> 125 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
126 # All rights reserved. 126 # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com>
diff --git a/meta/recipes-devtools/strace/strace_4.17.bb b/meta/recipes-devtools/strace/strace_4.18.bb
index 72fa994489..bbb82a9d84 100644
--- a/meta/recipes-devtools/strace/strace_4.17.bb
+++ b/meta/recipes-devtools/strace/strace_4.18.bb
@@ -2,7 +2,7 @@ SUMMARY = "System call tracing tool"
2HOMEPAGE = "http://strace.sourceforge.net" 2HOMEPAGE = "http://strace.sourceforge.net"
3SECTION = "console/utils" 3SECTION = "console/utils"
4LICENSE = "BSD" 4LICENSE = "BSD"
5LIC_FILES_CHKSUM = "file://COPYING;md5=488acb3aaaf5d14a2e1a852d13668a70" 5LIC_FILES_CHKSUM = "file://COPYING;md5=f132b4d2adfccc63da4139a609367711"
6 6
7SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ 7SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
8 file://disable-git-version-gen.patch \ 8 file://disable-git-version-gen.patch \
@@ -13,11 +13,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
13 file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ 13 file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \
14 file://mips-SIGEMT.patch \ 14 file://mips-SIGEMT.patch \
15 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ 15 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
16 file://0008-replace-struct-ucontext-with-ucontext_t.patch \
17 " 16 "
18 17
19SRC_URI[md5sum] = "8d7eb10eba68bad83a269197e634b626" 18SRC_URI[md5sum] = "3579b3266bb096cebaefbe2cdb1a3a78"
20SRC_URI[sha256sum] = "81f35b085fbb3cfa806eb521a8522ac3406deaccfe121ce35064bad268237419" 19SRC_URI[sha256sum] = "89ad887c1e6226bdbca8da31d589cadea4be0744b142eb47b768086c937fca08"
21 20
22inherit autotools ptest bluetooth 21inherit autotools ptest bluetooth
23 22