diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch | 25 | ||||
-rw-r--r-- | meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch | 69 | ||||
-rw-r--r-- | meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch | 52 | ||||
-rw-r--r-- | meta/recipes-devtools/strace/strace/Makefile-ptest.patch | 18 | ||||
-rw-r--r-- | meta/recipes-devtools/strace/strace/define-OS-ARCH-in-tests-Makefile-am.patch | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch | 46 | ||||
-rw-r--r-- | meta/recipes-devtools/strace/strace/strace-add-configure-options.patch | 49 | ||||
-rw-r--r-- | meta/recipes-devtools/strace/strace/update-gawk-paths.patch | 118 | ||||
-rw-r--r-- | meta/recipes-devtools/strace/strace_4.11.bb (renamed from meta/recipes-devtools/strace/strace_4.10.bb) | 18 |
9 files changed, 180 insertions, 241 deletions
diff --git a/meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch b/meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch deleted file mode 100644 index 0853959908..0000000000 --- a/meta/recipes-devtools/strace/strace/0001-Add-linux-aarch64-arch_regs.h.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From f85854131c8265f2eb59c714dcea5c4b3dc09bed Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen.kooi@linaro.org> | ||
3 | Date: Wed, 15 Apr 2015 14:29:37 +0200 | ||
4 | Subject: [PATCH] Add linux/aarch64/arch_regs.h | ||
5 | |||
6 | It is missing from the tarball, but it is present in git for v4.10 | ||
7 | |||
8 | Signed-off-by: Koen Kooi <koen.kooi@linaro.org> | ||
9 | Upstream-Status: Pending | ||
10 | --- | ||
11 | linux/aarch64/arch_regs.h | 2 ++ | ||
12 | 1 file changed, 2 insertions(+) | ||
13 | create mode 100644 linux/aarch64/arch_regs.h | ||
14 | |||
15 | diff --git a/linux/aarch64/arch_regs.h b/linux/aarch64/arch_regs.h | ||
16 | new file mode 100644 | ||
17 | index 0000000..9a5e33e | ||
18 | --- /dev/null | ||
19 | +++ b/linux/aarch64/arch_regs.h | ||
20 | @@ -0,0 +1,2 @@ | ||
21 | +extern uint64_t *const aarch64_sp_ptr; | ||
22 | +extern uint32_t *const arm_sp_ptr; | ||
23 | -- | ||
24 | 1.9.3 | ||
25 | |||
diff --git a/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch b/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch deleted file mode 100644 index d9346a8b71..0000000000 --- a/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | http://sourceforge.net/p/strace/code/ci/3460dc486d333231998de0f19918204aacee9ae3 | ||
4 | |||
5 | Expected to be released officially as part of strace 4.11 | ||
6 | |||
7 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
8 | |||
9 | From 3460dc486d333231998de0f19918204aacee9ae3 Mon Sep 17 00:00:00 2001 | ||
10 | From: Felix Janda <felix.janda@posteo.de> | ||
11 | Date: Sat, 28 Mar 2015 18:40:13 +0100 | ||
12 | Subject: [PATCH] Include <linux/ioctl.h> for _IOC_* macros | ||
13 | |||
14 | Fix a compilation failure with musl libc. | ||
15 | |||
16 | * evdev.c: Include <linux/ioctl.h>. | ||
17 | * ioctl.c: Include <linux/ioctl.h> instead of <asm/ioctl.h>. | ||
18 | * ioctlsort.c: Likewise. | ||
19 | |||
20 | Reported-by: Dima Krasner <dima@dimakrasner.com> | ||
21 | Acked-by: Mike Frysinger <vapier@gentoo.org> | ||
22 | --- | ||
23 | evdev.c | 2 ++ | ||
24 | ioctl.c | 2 +- | ||
25 | ioctlsort.c | 2 +- | ||
26 | 3 files changed, 4 insertions(+), 2 deletions(-) | ||
27 | |||
28 | diff --git a/evdev.c b/evdev.c | ||
29 | index 9a7430d..e06f9c1 100644 | ||
30 | --- a/evdev.c | ||
31 | +++ b/evdev.c | ||
32 | @@ -28,6 +28,8 @@ | ||
33 | |||
34 | #include "defs.h" | ||
35 | |||
36 | +#include <linux/ioctl.h> | ||
37 | + | ||
38 | #ifdef HAVE_LINUX_INPUT_H | ||
39 | #include <linux/input.h> | ||
40 | #include "xlat/evdev_abs.h" | ||
41 | diff --git a/ioctl.c b/ioctl.c | ||
42 | index 46f8334..c67d048 100644 | ||
43 | --- a/ioctl.c | ||
44 | +++ b/ioctl.c | ||
45 | @@ -29,7 +29,7 @@ | ||
46 | */ | ||
47 | |||
48 | #include "defs.h" | ||
49 | -#include <asm/ioctl.h> | ||
50 | +#include <linux/ioctl.h> | ||
51 | #include "xlat/ioctl_dirs.h" | ||
52 | |||
53 | #ifdef HAVE_LINUX_INPUT_H | ||
54 | diff --git a/ioctlsort.c b/ioctlsort.c | ||
55 | index 333556c..9c31691 100644 | ||
56 | --- a/ioctlsort.c | ||
57 | +++ b/ioctlsort.c | ||
58 | @@ -33,7 +33,7 @@ | ||
59 | #include <stdio.h> | ||
60 | #include <stdlib.h> | ||
61 | #include <string.h> | ||
62 | -#include <asm/ioctl.h> | ||
63 | +#include <linux/ioctl.h> | ||
64 | |||
65 | struct ioctlent { | ||
66 | const char *info; | ||
67 | -- | ||
68 | 1.9.1 | ||
69 | |||
diff --git a/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch b/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch deleted file mode 100644 index 0b072fe533..0000000000 --- a/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | http://sourceforge.net/p/strace/code/ci/d34e00b293942b1012ddc49ed3ab379a32337611 | ||
4 | |||
5 | Expected to be released officially as part of strace 4.11 | ||
6 | |||
7 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
8 | |||
9 | From d34e00b293942b1012ddc49ed3ab379a32337611 Mon Sep 17 00:00:00 2001 | ||
10 | From: Felix Janda <felix.janda@posteo.de> | ||
11 | Date: Sat, 28 Mar 2015 18:21:09 +0100 | ||
12 | Subject: [PATCH] Include <sys/stat.h> for S_I* macros | ||
13 | |||
14 | Fix a compilation failure with musl libc. | ||
15 | |||
16 | * mknod.c: Include <sys/stat.h>. | ||
17 | * printmode.c: Likewise. | ||
18 | |||
19 | Reported-by: Dima Krasner <dima@dimakrasner.com> | ||
20 | Acked-by: Mike Frysinger <vapier@gentoo.org> | ||
21 | --- | ||
22 | mknod.c | 1 + | ||
23 | printmode.c | 1 + | ||
24 | 2 files changed, 2 insertions(+) | ||
25 | |||
26 | diff --git a/mknod.c b/mknod.c | ||
27 | index 07e9a45..1463232 100644 | ||
28 | --- a/mknod.c | ||
29 | +++ b/mknod.c | ||
30 | @@ -1,6 +1,7 @@ | ||
31 | #include "defs.h" | ||
32 | |||
33 | #include <fcntl.h> | ||
34 | +#include <sys/stat.h> | ||
35 | |||
36 | #ifdef MAJOR_IN_SYSMACROS | ||
37 | # include <sys/sysmacros.h> | ||
38 | diff --git a/printmode.c b/printmode.c | ||
39 | index 4df1b9f..a721936 100644 | ||
40 | --- a/printmode.c | ||
41 | +++ b/printmode.c | ||
42 | @@ -1,6 +1,7 @@ | ||
43 | #include "defs.h" | ||
44 | |||
45 | #include <fcntl.h> | ||
46 | +#include <sys/stat.h> | ||
47 | |||
48 | #include "xlat/modetypes.h" | ||
49 | |||
50 | -- | ||
51 | 1.9.1 | ||
52 | |||
diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index f3603012f4..824031e863 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch | |||
@@ -10,32 +10,32 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | |||
10 | 2 files changed, 19 insertions(+), 1 deletion(-) | 10 | 2 files changed, 19 insertions(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/configure.ac b/configure.ac | 12 | diff --git a/configure.ac b/configure.ac |
13 | index e73958c..5f0dfee 100644 | 13 | index 0209bac..b969e25 100644 |
14 | --- a/configure.ac | 14 | --- a/configure.ac |
15 | +++ b/configure.ac | 15 | +++ b/configure.ac |
16 | @@ -6,7 +6,7 @@ AC_INIT([strace], | 16 | @@ -36,7 +36,7 @@ AC_INIT([strace], |
17 | AC_CONFIG_SRCDIR([strace.c]) | 17 | AC_CONFIG_SRCDIR([strace.c]) |
18 | AC_CONFIG_AUX_DIR([.]) | 18 | AC_CONFIG_AUX_DIR([.]) |
19 | AC_CONFIG_HEADERS([config.h]) | 19 | AC_CONFIG_HEADERS([config.h]) |
20 | -AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules parallel-tests]) | 20 | -AM_INIT_AUTOMAKE([foreign nostdinc dist-xz no-dist-gzip silent-rules parallel-tests]) |
21 | +AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules serial-tests]) | 21 | +AM_INIT_AUTOMAKE([foreign nostdinc dist-xz no-dist-gzip silent-rules serial-tests]) |
22 | AM_MAINTAINER_MODE | 22 | AM_MAINTAINER_MODE |
23 | AC_CANONICAL_HOST | 23 | AC_CANONICAL_HOST |
24 | 24 | ||
25 | diff --git a/tests/Makefile.am b/tests/Makefile.am | 25 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
26 | index ff5e136..984bdb6 100644 | 26 | index 0f23b4b..429f7e9 100644 |
27 | --- a/tests/Makefile.am | 27 | --- a/tests/Makefile.am |
28 | +++ b/tests/Makefile.am | 28 | +++ b/tests/Makefile.am |
29 | @@ -101,3 +101,21 @@ EXTRA_DIST = init.sh run.sh \ | 29 | @@ -332,3 +332,21 @@ ksysent.h: $(srcdir)/ksysent.sed |
30 | $(TESTS) | ||
31 | 30 | ||
32 | CLEANFILES = $(TESTS:=.tmp) | 31 | BUILT_SOURCES = ksysent.h |
32 | CLEANFILES = ksysent.h $(TESTS:=.tmp) | ||
33 | + | 33 | + |
34 | +buildtest-TESTS: $(check_PROGRAMS) $(TESTS) | 34 | +buildtest-TESTS: $(check_PROGRAMS) $(TESTS) |
35 | + | 35 | + |
36 | +install-ptest: | 36 | +install-ptest: |
37 | + install $(BUILDDIR)/strace $(DESTDIR) | 37 | + install $(BUILDDIR)/strace $(DESTDIR) |
38 | + install "$(srcdir)/.."/strace-log-merge $(DESTDIR) | 38 | + install $(srcdir)/../strace-log-merge $(DESTDIR) |
39 | + install -d $(DESTDIR)/$(TESTDIR) | 39 | + install -d $(DESTDIR)/$(TESTDIR) |
40 | + cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR) | 40 | + cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR) |
41 | + 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/define-OS-ARCH-in-tests-Makefile-am.patch b/meta/recipes-devtools/strace/strace/define-OS-ARCH-in-tests-Makefile-am.patch deleted file mode 100644 index 4b1bb26bb3..0000000000 --- a/meta/recipes-devtools/strace/strace/define-OS-ARCH-in-tests-Makefile-am.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Ensure that OS and ARCH are defined in tests/Makefile.am | ||
2 | |||
3 | For strace v4.10 this is a purely cosmetic fix, since the include | ||
4 | paths derived from $(OS)/${ARCH) are never used. These variables are | ||
5 | correctly defined by default in strace v4.11. | ||
6 | |||
7 | Partial backport of upstream commit: | ||
8 | |||
9 | http://sourceforge.net/p/strace/code/ci/25c804ce42261b24b19d35c637bf2745c237ee07 | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | |||
13 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
14 | |||
15 | Index: strace-4.10/tests/Makefile.am | ||
16 | =================================================================== | ||
17 | --- strace-4.10.orig/tests/Makefile.am | ||
18 | +++ strace-4.10/tests/Makefile.am | ||
19 | @@ -1,5 +1,7 @@ | ||
20 | # Automake input for strace tests. | ||
21 | |||
22 | +OS = linux | ||
23 | +ARCH = @arch@ | ||
24 | AM_CFLAGS = $(WARN_CFLAGS) | ||
25 | AM_CPPFLAGS = -I$(top_builddir)/$(OS)/$(ARCH) \ | ||
26 | -I$(top_srcdir)/$(OS)/$(ARCH) \ | ||
diff --git a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch new file mode 100644 index 0000000000..756cd8bb82 --- /dev/null +++ b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 154af50ed7ed8b91838d713052ebf29b0b14f765 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
3 | Date: Mon, 18 Jan 2016 11:00:00 -0800 | ||
4 | Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support | ||
5 | |||
6 | When using the default OE toolchain for x86-64, the basic checks for | ||
7 | -m32 and -mx32 compile support in mpers.m4 pass but later attempts to | ||
8 | actually use the toolchain with -m32 fail, e.g. | ||
9 | |||
10 | | In file included from /home/andre/build/tmp/sysroots/qemux86-64/usr/include/sys/syscall.h:31:0, | ||
11 | | from ../strace-4.11/defs.h:55, | ||
12 | | from mpers-m32/kernel_dirent.c:32: | ||
13 | | /home/andre/build/tmp/sysroots/qemux86-64/usr/include/bits/syscall.h:41:29: fatal error: bits/syscall-32.h: No such file or directory | ||
14 | |||
15 | Make the mpers.m4 tests more robust so that configure correctly | ||
16 | detects the limitations of the OE toolchain. | ||
17 | |||
18 | Upstream-Status: Pending | ||
19 | |||
20 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
21 | --- | ||
22 | m4/mpers.m4 | 2 ++ | ||
23 | 1 file changed, 2 insertions(+) | ||
24 | |||
25 | diff --git a/m4/mpers.m4 b/m4/mpers.m4 | ||
26 | index 1fe8a8e..d72c717 100644 | ||
27 | --- a/m4/mpers.m4 | ||
28 | +++ b/m4/mpers.m4 | ||
29 | @@ -53,12 +53,14 @@ case "$arch" in | ||
30 | CFLAGS="$CFLAGS CFLAG $IFLAG" | ||
31 | AC_CACHE_CHECK([for CFLAG compile support], [st_cv_cc], | ||
32 | [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdint.h> | ||
33 | + #include <sys/syscall.h> | ||
34 | int main(){return 0;}]])], | ||
35 | [st_cv_cc=yes], | ||
36 | [st_cv_cc=no])]) | ||
37 | if test $st_cv_cc = yes; then | ||
38 | AC_CACHE_CHECK([for CFLAG runtime support], [st_cv_runtime], | ||
39 | [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdint.h> | ||
40 | + #include <sys/syscall.h> | ||
41 | int main(){return 0;}]])], | ||
42 | [st_cv_runtime=yes], | ||
43 | [st_cv_runtime=no], | ||
44 | -- | ||
45 | 1.9.1 | ||
46 | |||
diff --git a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch deleted file mode 100644 index 84b9f9cab5..0000000000 --- a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | Add option "aio" to enable/disable libaio support. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
6 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
7 | --- | ||
8 | configure.ac | 26 ++++++++++++++++++++++++++ | ||
9 | 1 file changed, 26 insertions(+) | ||
10 | |||
11 | diff --git a/configure.ac b/configure.ac | ||
12 | index e73958c..9099370 100644 | ||
13 | --- a/configure.ac | ||
14 | +++ b/configure.ac | ||
15 | @@ -303,11 +303,6 @@ AC_CHECK_MEMBERS([struct sysinfo.totalhi | ||
16 | |||
17 | AC_CHECK_TYPES([struct flock64],,, [#include <fcntl.h>]) | ||
18 | |||
19 | -AC_CHECK_HEADERS([libaio.h], [ | ||
20 | - AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include <libaio.h>]) | ||
21 | - AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include <libaio.h>]) | ||
22 | -]) | ||
23 | - | ||
24 | AC_CHECK_HEADERS([linux/input.h], [ | ||
25 | AC_CHECK_MEMBERS([struct input_absinfo.resolution],,, [#include <linux/input.h>]) | ||
26 | ]) | ||
27 | @@ -745,6 +740,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes; | ||
28 | fi | ||
29 | AC_SUBST(dl_LIBS) | ||
30 | |||
31 | +AC_ARG_ENABLE([aio], | ||
32 | + [AS_HELP_STRING([--enable-aio], [turn on libaio support])], | ||
33 | + [case $enableval in | ||
34 | + yes) | ||
35 | + AC_CHECK_HEADERS([libaio.h], [ | ||
36 | + AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include <libaio.h>]) | ||
37 | + AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include <libaio.h>]) | ||
38 | + ]) | ||
39 | + ;; | ||
40 | + no) ;; | ||
41 | + *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; | ||
42 | + esac] | ||
43 | +) | ||
44 | + | ||
45 | AC_PATH_PROG([PERL], [perl]) | ||
46 | |||
47 | dnl stack trace with libunwind | ||
48 | -- | ||
49 | 1.9.1 | ||
diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch new file mode 100644 index 0000000000..bfc7f34419 --- /dev/null +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch | |||
@@ -0,0 +1,118 @@ | |||
1 | From 3836518c46bd5bb3e71371b1b18274bf2d487133 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
3 | Date: Mon, 18 Jan 2016 11:01:00 -0800 | ||
4 | Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk | ||
5 | |||
6 | The default path to gawk is /usr/bin/gawk, so update test scripts etc | ||
7 | from #!/bin/gawk to #!/usr/bin/gawk. Fixes missing RDPENDS QA tests: | ||
8 | |||
9 | WARNING: QA Issue: /usr/lib/strace/ptest/tests/unix-yy-accept.awk_strace-ptest contained in package strace-ptest requires /bin/gawk, but no providers found in its RDEPENDS [file-rdeps] | ||
10 | |||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
13 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
14 | --- | ||
15 | mpers.awk | 2 +- | ||
16 | tests/caps.awk | 2 +- | ||
17 | tests/match.awk | 2 +- | ||
18 | tests/net-yy-accept.awk | 2 +- | ||
19 | tests/net-yy-connect.awk | 2 +- | ||
20 | tests/sigaction.awk | 2 +- | ||
21 | tests/uid.awk | 2 +- | ||
22 | tests/unix-yy-accept.awk | 2 +- | ||
23 | tests/unix-yy-connect.awk | 2 +- | ||
24 | 9 files changed, 9 insertions(+), 9 deletions(-) | ||
25 | |||
26 | diff --git a/mpers.awk b/mpers.awk | ||
27 | index 73bf0b0..50e6c16 100644 | ||
28 | --- a/mpers.awk | ||
29 | +++ b/mpers.awk | ||
30 | @@ -1,4 +1,4 @@ | ||
31 | -#!/bin/gawk | ||
32 | +#!/usr/bin/gawk | ||
33 | # | ||
34 | # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com> | ||
35 | # Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org> | ||
36 | diff --git a/tests/caps.awk b/tests/caps.awk | ||
37 | index bad8b0f..845f37c 100644 | ||
38 | --- a/tests/caps.awk | ||
39 | +++ b/tests/caps.awk | ||
40 | @@ -1,4 +1,4 @@ | ||
41 | -#!/bin/gawk | ||
42 | +#!/usr/bin/gawk | ||
43 | # | ||
44 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> | ||
45 | # All rights reserved. | ||
46 | diff --git a/tests/match.awk b/tests/match.awk | ||
47 | index abfbae9..f2740bf 100644 | ||
48 | --- a/tests/match.awk | ||
49 | +++ b/tests/match.awk | ||
50 | @@ -1,4 +1,4 @@ | ||
51 | -#!/bin/gawk | ||
52 | +#!/usr/bin/gawk | ||
53 | # | ||
54 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> | ||
55 | # All rights reserved. | ||
56 | diff --git a/tests/net-yy-accept.awk b/tests/net-yy-accept.awk | ||
57 | index fed3e30..e916ab0 100644 | ||
58 | --- a/tests/net-yy-accept.awk | ||
59 | +++ b/tests/net-yy-accept.awk | ||
60 | @@ -1,4 +1,4 @@ | ||
61 | -#!/bin/gawk | ||
62 | +#!/usr/bin/gawk | ||
63 | # | ||
64 | # Copyright (c) 2014 Masatake YAMATO <yamato@redhat.com> | ||
65 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> | ||
66 | diff --git a/tests/net-yy-connect.awk b/tests/net-yy-connect.awk | ||
67 | index f4dcf91..b3cec8c 100644 | ||
68 | --- a/tests/net-yy-connect.awk | ||
69 | +++ b/tests/net-yy-connect.awk | ||
70 | @@ -1,4 +1,4 @@ | ||
71 | -#!/bin/gawk | ||
72 | +#!/usr/bin/gawk | ||
73 | # | ||
74 | # Copyright (c) 2014 Masatake YAMATO <yamato@redhat.com> | ||
75 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> | ||
76 | diff --git a/tests/sigaction.awk b/tests/sigaction.awk | ||
77 | index 5c6b6d0..3e14464 100644 | ||
78 | --- a/tests/sigaction.awk | ||
79 | +++ b/tests/sigaction.awk | ||
80 | @@ -1,4 +1,4 @@ | ||
81 | -#!/bin/gawk | ||
82 | +#!/usr/bin/gawk | ||
83 | # | ||
84 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> | ||
85 | # All rights reserved. | ||
86 | diff --git a/tests/uid.awk b/tests/uid.awk | ||
87 | index a56c5be..67b0749 100644 | ||
88 | --- a/tests/uid.awk | ||
89 | +++ b/tests/uid.awk | ||
90 | @@ -1,4 +1,4 @@ | ||
91 | -#!/bin/gawk | ||
92 | +#!/usr/bin/gawk | ||
93 | # | ||
94 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> | ||
95 | # All rights reserved. | ||
96 | diff --git a/tests/unix-yy-accept.awk b/tests/unix-yy-accept.awk | ||
97 | index 4ed60e4..2a9d9c0 100644 | ||
98 | --- a/tests/unix-yy-accept.awk | ||
99 | +++ b/tests/unix-yy-accept.awk | ||
100 | @@ -1,4 +1,4 @@ | ||
101 | -#!/bin/gawk | ||
102 | +#!/usr/bin/gawk | ||
103 | # | ||
104 | # Copyright (c) 2014 Masatake YAMATO <yamato@redhat.com> | ||
105 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> | ||
106 | diff --git a/tests/unix-yy-connect.awk b/tests/unix-yy-connect.awk | ||
107 | index 262bf2e..c809dfa 100644 | ||
108 | --- a/tests/unix-yy-connect.awk | ||
109 | +++ b/tests/unix-yy-connect.awk | ||
110 | @@ -1,4 +1,4 @@ | ||
111 | -#!/bin/gawk | ||
112 | +#!/usr/bin/gawk | ||
113 | # | ||
114 | # Copyright (c) 2014 Masatake YAMATO <yamato@redhat.com> | ||
115 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> | ||
116 | -- | ||
117 | 1.9.1 | ||
118 | |||
diff --git a/meta/recipes-devtools/strace/strace_4.10.bb b/meta/recipes-devtools/strace/strace_4.11.bb index 1b6474347a..a72a1f9c24 100644 --- a/meta/recipes-devtools/strace/strace_4.10.bb +++ b/meta/recipes-devtools/strace/strace_4.11.bb | |||
@@ -5,30 +5,26 @@ LICENSE = "BSD" | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=124500c21e856f0912df29295ba104c7" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=124500c21e856f0912df29295ba104c7" |
6 | 6 | ||
7 | SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ | 7 | SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ |
8 | file://0001-Add-linux-aarch64-arch_regs.h.patch \ | ||
9 | file://disable-git-version-gen.patch \ | 8 | file://disable-git-version-gen.patch \ |
10 | file://strace-add-configure-options.patch \ | 9 | file://more-robust-test-for-m32-mx32-compile-support.patch \ |
10 | file://update-gawk-paths.patch \ | ||
11 | file://Makefile-ptest.patch \ | 11 | file://Makefile-ptest.patch \ |
12 | file://run-ptest \ | 12 | file://run-ptest \ |
13 | file://Include-sys-stat.h-for-S_I-macros.patch \ | ||
14 | file://Include-linux-ioctl.h-for-_IOC_-macros.patch \ | ||
15 | file://define-OS-ARCH-in-tests-Makefile-am.patch \ | ||
16 | " | 13 | " |
17 | 14 | ||
18 | SRC_URI[md5sum] = "107a5be455493861189e9b57a3a51912" | 15 | SRC_URI[md5sum] = "a15d2555a7febb56d00c6e1a51c655dc" |
19 | SRC_URI[sha256sum] = "e6180d866ef9e76586b96e2ece2bfeeb3aa23f5cc88153f76e9caedd65e40ee2" | 16 | SRC_URI[sha256sum] = "e86a5f6cd8f941f67f3e4b28f4e60f3d9185c951cf266404533210a2e5cd8152" |
20 | 17 | ||
21 | inherit autotools ptest bluetooth | 18 | inherit autotools ptest bluetooth |
22 | RDEPENDS_${PN}-ptest += "make coreutils grep gawk" | 19 | |
20 | RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" | ||
23 | 21 | ||
24 | PACKAGECONFIG_class-target ??= "\ | 22 | PACKAGECONFIG_class-target ??= "\ |
25 | libaio \ | ||
26 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ | 23 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ |
27 | " | 24 | " |
28 | 25 | ||
29 | PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio" | ||
30 | PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind" | ||
31 | PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}" | 26 | PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}" |
27 | PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" | ||
32 | 28 | ||
33 | TESTDIR = "tests" | 29 | TESTDIR = "tests" |
34 | 30 | ||