diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-03-19 09:43:56 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-20 18:54:56 +0000 |
commit | d497d046f01071deb7ab5e408af6a1b912dfeba6 (patch) | |
tree | 7ea6cf572be5fe591e65e631ace3e820e9c35479 /meta/recipes-devtools/strace/strace | |
parent | b1deccbd49cc3f785623b7600b8668fc0236f5cd (diff) | |
download | poky-d497d046f01071deb7ab5e408af6a1b912dfeba6.tar.gz |
strace: update 5.10 -> 5.11
Drop disable-git-version-gen.patch as problem fixed upstream.
Add parallel builds to ptest compile.
strace-graph has been removed upstream.
Adjust ptest patch to match upstream changes.
License-Update: copyright years.
(From OE-Core rev: 09af1c98499c9919dc2ebf7eb11796d3d912a8a5)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/strace/strace')
3 files changed, 32 insertions, 68 deletions
diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 42c1893f39..4cef0c0127 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 | 1 | From 205e7661822987825c7149ada4eefdc5368828ce Mon Sep 17 00:00:00 2001 |
2 | From: Gabriel Barbu <gabriel.barbu@enea.com> | 2 | From: Gabriel Barbu <gabriel.barbu@enea.com> |
3 | Date: Thu, 25 Jul 2013 15:28:33 +0200 | 3 | Date: Thu, 25 Jul 2013 15:28:33 +0200 |
4 | Subject: [PATCH] strace: Add ptest | 4 | Subject: [PATCH] strace: Add ptest |
@@ -10,14 +10,14 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | |||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
11 | 11 | ||
12 | --- | 12 | --- |
13 | tests/Makefile.am | 19 +++++++++++++++++++ | 13 | tests/Makefile.am | 20 ++++++++++++++++++++ |
14 | 1 file changed, 19 insertions(+) | 14 | 1 file changed, 20 insertions(+) |
15 | 15 | ||
16 | diff --git a/tests/Makefile.am b/tests/Makefile.am | 16 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
17 | index 8cf4c36..66162eb 100644 | 17 | index b8efce8..fa9a1af 100644 |
18 | --- a/tests/Makefile.am | 18 | --- a/tests/Makefile.am |
19 | +++ b/tests/Makefile.am | 19 | +++ b/tests/Makefile.am |
20 | @@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ | 20 | @@ -16,6 +16,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ |
21 | MPERS_NAME = | 21 | MPERS_NAME = |
22 | MPERS_CC_FLAGS = | 22 | MPERS_CC_FLAGS = |
23 | ARCH_MFLAGS = | 23 | ARCH_MFLAGS = |
@@ -25,16 +25,17 @@ index 8cf4c36..66162eb 100644 | |||
25 | AM_CFLAGS = $(WARN_CFLAGS) | 25 | AM_CFLAGS = $(WARN_CFLAGS) |
26 | AM_CPPFLAGS = $(ARCH_MFLAGS) \ | 26 | AM_CPPFLAGS = $(ARCH_MFLAGS) \ |
27 | -I$(builddir) \ | 27 | -I$(builddir) \ |
28 | @@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h | 28 | @@ -692,3 +693,22 @@ BUILT_SOURCES = ksysent.h |
29 | CLEANFILES = ksysent.h | 29 | CLEANFILES = ksysent.h |
30 | 30 | ||
31 | include ../scno.am | 31 | include ../src/scno.am |
32 | + | 32 | + |
33 | +buildtest-TESTS: $(check_PROGRAMS) $(TESTS) | 33 | +buildtest-TESTS: $(check_PROGRAMS) $(TESTS) |
34 | + | 34 | + |
35 | +install-ptest: | 35 | +install-ptest: |
36 | + install $(BUILDDIR)/strace $(DESTDIR) | 36 | + install -d $(DESTDIR)/src |
37 | + install $(srcdir)/../strace-log-merge $(DESTDIR) | 37 | + install $(BUILDDIR)/src/strace $(DESTDIR)/src |
38 | + install $(srcdir)/../src/strace-log-merge $(DESTDIR)/src | ||
38 | + install -d $(DESTDIR)/$(TESTDIR) | 39 | + install -d $(DESTDIR)/$(TESTDIR) |
39 | + cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR) | 40 | + cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR) |
40 | + sed -i -e 's/^Makefile:/_Makefile:/' $(DESTDIR)/$(TESTDIR)/Makefile | 41 | + sed -i -e 's/^Makefile:/_Makefile:/' $(DESTDIR)/$(TESTDIR)/Makefile |
diff --git a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch deleted file mode 100644 index e8dbd7f273..0000000000 --- a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From d87a7feb5ea75da7061afdd473faba044ec8eb0f Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
3 | Date: Mon, 18 Jan 2016 13:33:50 -0800 | ||
4 | Subject: [PATCH] strace: remove need for scripts | ||
5 | |||
6 | git-version-gen copyright-year-gen file-date-gen are not included in | ||
7 | tarball releases, so we need to avoid attempts to call them. | ||
8 | |||
9 | Upstream-Status: Inappropriate [configuration] | ||
10 | |||
11 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
12 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
13 | |||
14 | --- | ||
15 | configure.ac | 6 +++--- | ||
16 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index dd4f13f..65f000b 100644 | ||
20 | --- a/configure.ac | ||
21 | +++ b/configure.ac | ||
22 | @@ -12,12 +12,12 @@ | ||
23 | |||
24 | AC_PREREQ(2.57) | ||
25 | AC_INIT([strace], | ||
26 | - st_esyscmd_s([./git-version-gen .tarball-version]), | ||
27 | + m4_esyscmd_s([cat .tarball-version]), | ||
28 | [strace-devel@lists.strace.io], | ||
29 | [strace], | ||
30 | [https://strace.io]) | ||
31 | -m4_define([copyright_year], st_esyscmd_s([./copyright-year-gen .year])) | ||
32 | -m4_define([manpage_date], st_esyscmd_s([./file-date-gen strace.1.in])) | ||
33 | +m4_define([copyright_year], m4_esyscmd_s([cat .year])) | ||
34 | +m4_define([manpage_date], m4_esyscmd_s([cat .strace.1.in.date])) | ||
35 | AC_COPYRIGHT([Copyright (c) 1999-]copyright_year[ The strace developers.]) | ||
36 | AC_CONFIG_SRCDIR([strace.c]) | ||
37 | AC_CONFIG_AUX_DIR([.]) | ||
diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index d46b147de5..0c683496ae 100644 --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 12a726b280eca94883edcb4da1eaaf8e93d41739 Mon Sep 17 00:00:00 2001 | 1 | From 4cd26cfaec255ec87f22abe886e0be89312a9671 Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <armccurdy@gmail.com> | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
3 | Date: Mon, 18 Jan 2016 11:01:00 -0800 | 3 | Date: Mon, 18 Jan 2016 11:01:00 -0800 |
4 | Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk | 4 | Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk |
@@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [configuration] | |||
13 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | 13 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
14 | 14 | ||
15 | --- | 15 | --- |
16 | mpers.awk | 2 +- | 16 | src/mpers.awk | 2 +- |
17 | tests-m32/caps.awk | 2 +- | 17 | tests-m32/caps.awk | 2 +- |
18 | tests-m32/match.awk | 2 +- | 18 | tests-m32/match.awk | 2 +- |
19 | tests-m32/rt_sigaction.awk | 2 +- | 19 | tests-m32/rt_sigaction.awk | 2 +- |
@@ -25,18 +25,18 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | |||
25 | tests/rt_sigaction.awk | 2 +- | 25 | tests/rt_sigaction.awk | 2 +- |
26 | 10 files changed, 10 insertions(+), 10 deletions(-) | 26 | 10 files changed, 10 insertions(+), 10 deletions(-) |
27 | 27 | ||
28 | diff --git a/mpers.awk b/mpers.awk | 28 | diff --git a/src/mpers.awk b/src/mpers.awk |
29 | index 17f8f2b..d69dcd5 100644 | 29 | index 25a212f..b2ff53f 100644 |
30 | --- a/mpers.awk | 30 | --- a/src/mpers.awk |
31 | +++ b/mpers.awk | 31 | +++ b/src/mpers.awk |
32 | @@ -1,4 +1,4 @@ | 32 | @@ -1,4 +1,4 @@ |
33 | -#!/bin/gawk | 33 | -#!/bin/gawk |
34 | +#!/usr/bin/gawk | 34 | +#!/usr/bin/gawk |
35 | # | 35 | # |
36 | # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com> | 36 | # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com> |
37 | # Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org> | 37 | # Copyright (c) 2015-2016 Dmitry V. Levin <ldv@strace.io> |
38 | diff --git a/tests-m32/caps.awk b/tests-m32/caps.awk | 38 | diff --git a/tests-m32/caps.awk b/tests-m32/caps.awk |
39 | index 941564a..0bcc3ff 100644 | 39 | index 69500ec..e5dfd87 100644 |
40 | --- a/tests-m32/caps.awk | 40 | --- a/tests-m32/caps.awk |
41 | +++ b/tests-m32/caps.awk | 41 | +++ b/tests-m32/caps.awk |
42 | @@ -1,4 +1,4 @@ | 42 | @@ -1,4 +1,4 @@ |
@@ -46,27 +46,27 @@ index 941564a..0bcc3ff 100644 | |||
46 | # This file is part of caps strace test. | 46 | # This file is part of caps strace test. |
47 | # | 47 | # |
48 | diff --git a/tests-m32/match.awk b/tests-m32/match.awk | 48 | diff --git a/tests-m32/match.awk b/tests-m32/match.awk |
49 | index d91c518..ee5d908 100644 | 49 | index 1cde87c..df63f78 100644 |
50 | --- a/tests-m32/match.awk | 50 | --- a/tests-m32/match.awk |
51 | +++ b/tests-m32/match.awk | 51 | +++ b/tests-m32/match.awk |
52 | @@ -1,4 +1,4 @@ | 52 | @@ -1,4 +1,4 @@ |
53 | -#!/bin/gawk | 53 | -#!/bin/gawk |
54 | +#!/usr/bin/gawk | 54 | +#!/usr/bin/gawk |
55 | # | 55 | # |
56 | # Copyright (c) 2014-2018 Dmitry V. Levin <ldv@altlinux.org> | 56 | # Copyright (c) 2014-2021 Dmitry V. Levin <ldv@strace.io> |
57 | # All rights reserved. | 57 | # All rights reserved. |
58 | diff --git a/tests-m32/rt_sigaction.awk b/tests-m32/rt_sigaction.awk | 58 | diff --git a/tests-m32/rt_sigaction.awk b/tests-m32/rt_sigaction.awk |
59 | index 81dd813..9cd9549 100644 | 59 | index dce78f5..573d9ea 100644 |
60 | --- a/tests-m32/rt_sigaction.awk | 60 | --- a/tests-m32/rt_sigaction.awk |
61 | +++ b/tests-m32/rt_sigaction.awk | 61 | +++ b/tests-m32/rt_sigaction.awk |
62 | @@ -1,4 +1,4 @@ | 62 | @@ -1,4 +1,4 @@ |
63 | -#!/bin/gawk | 63 | -#!/bin/gawk |
64 | +#!/usr/bin/gawk | 64 | +#!/usr/bin/gawk |
65 | # | 65 | # |
66 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> | 66 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@strace.io> |
67 | # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> | 67 | # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> |
68 | diff --git a/tests-mx32/caps.awk b/tests-mx32/caps.awk | 68 | diff --git a/tests-mx32/caps.awk b/tests-mx32/caps.awk |
69 | index 941564a..0bcc3ff 100644 | 69 | index 69500ec..e5dfd87 100644 |
70 | --- a/tests-mx32/caps.awk | 70 | --- a/tests-mx32/caps.awk |
71 | +++ b/tests-mx32/caps.awk | 71 | +++ b/tests-mx32/caps.awk |
72 | @@ -1,4 +1,4 @@ | 72 | @@ -1,4 +1,4 @@ |
@@ -76,27 +76,27 @@ index 941564a..0bcc3ff 100644 | |||
76 | # This file is part of caps strace test. | 76 | # This file is part of caps strace test. |
77 | # | 77 | # |
78 | diff --git a/tests-mx32/match.awk b/tests-mx32/match.awk | 78 | diff --git a/tests-mx32/match.awk b/tests-mx32/match.awk |
79 | index d91c518..ee5d908 100644 | 79 | index 1cde87c..df63f78 100644 |
80 | --- a/tests-mx32/match.awk | 80 | --- a/tests-mx32/match.awk |
81 | +++ b/tests-mx32/match.awk | 81 | +++ b/tests-mx32/match.awk |
82 | @@ -1,4 +1,4 @@ | 82 | @@ -1,4 +1,4 @@ |
83 | -#!/bin/gawk | 83 | -#!/bin/gawk |
84 | +#!/usr/bin/gawk | 84 | +#!/usr/bin/gawk |
85 | # | 85 | # |
86 | # Copyright (c) 2014-2018 Dmitry V. Levin <ldv@altlinux.org> | 86 | # Copyright (c) 2014-2021 Dmitry V. Levin <ldv@strace.io> |
87 | # All rights reserved. | 87 | # All rights reserved. |
88 | diff --git a/tests-mx32/rt_sigaction.awk b/tests-mx32/rt_sigaction.awk | 88 | diff --git a/tests-mx32/rt_sigaction.awk b/tests-mx32/rt_sigaction.awk |
89 | index 81dd813..9cd9549 100644 | 89 | index dce78f5..573d9ea 100644 |
90 | --- a/tests-mx32/rt_sigaction.awk | 90 | --- a/tests-mx32/rt_sigaction.awk |
91 | +++ b/tests-mx32/rt_sigaction.awk | 91 | +++ b/tests-mx32/rt_sigaction.awk |
92 | @@ -1,4 +1,4 @@ | 92 | @@ -1,4 +1,4 @@ |
93 | -#!/bin/gawk | 93 | -#!/bin/gawk |
94 | +#!/usr/bin/gawk | 94 | +#!/usr/bin/gawk |
95 | # | 95 | # |
96 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> | 96 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@strace.io> |
97 | # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> | 97 | # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> |
98 | diff --git a/tests/caps.awk b/tests/caps.awk | 98 | diff --git a/tests/caps.awk b/tests/caps.awk |
99 | index 941564a..0bcc3ff 100644 | 99 | index 69500ec..e5dfd87 100644 |
100 | --- a/tests/caps.awk | 100 | --- a/tests/caps.awk |
101 | +++ b/tests/caps.awk | 101 | +++ b/tests/caps.awk |
102 | @@ -1,4 +1,4 @@ | 102 | @@ -1,4 +1,4 @@ |
@@ -106,22 +106,22 @@ index 941564a..0bcc3ff 100644 | |||
106 | # This file is part of caps strace test. | 106 | # This file is part of caps strace test. |
107 | # | 107 | # |
108 | diff --git a/tests/match.awk b/tests/match.awk | 108 | diff --git a/tests/match.awk b/tests/match.awk |
109 | index d91c518..ee5d908 100644 | 109 | index 1cde87c..df63f78 100644 |
110 | --- a/tests/match.awk | 110 | --- a/tests/match.awk |
111 | +++ b/tests/match.awk | 111 | +++ b/tests/match.awk |
112 | @@ -1,4 +1,4 @@ | 112 | @@ -1,4 +1,4 @@ |
113 | -#!/bin/gawk | 113 | -#!/bin/gawk |
114 | +#!/usr/bin/gawk | 114 | +#!/usr/bin/gawk |
115 | # | 115 | # |
116 | # Copyright (c) 2014-2018 Dmitry V. Levin <ldv@altlinux.org> | 116 | # Copyright (c) 2014-2021 Dmitry V. Levin <ldv@strace.io> |
117 | # All rights reserved. | 117 | # All rights reserved. |
118 | diff --git a/tests/rt_sigaction.awk b/tests/rt_sigaction.awk | 118 | diff --git a/tests/rt_sigaction.awk b/tests/rt_sigaction.awk |
119 | index 81dd813..9cd9549 100644 | 119 | index dce78f5..573d9ea 100644 |
120 | --- a/tests/rt_sigaction.awk | 120 | --- a/tests/rt_sigaction.awk |
121 | +++ b/tests/rt_sigaction.awk | 121 | +++ b/tests/rt_sigaction.awk |
122 | @@ -1,4 +1,4 @@ | 122 | @@ -1,4 +1,4 @@ |
123 | -#!/bin/gawk | 123 | -#!/bin/gawk |
124 | +#!/usr/bin/gawk | 124 | +#!/usr/bin/gawk |
125 | # | 125 | # |
126 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> | 126 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@strace.io> |
127 | # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> | 127 | # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> |