summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-08-25 23:25:15 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-26 11:29:45 +0100
commit126227582a06fecb4971315be6aa72be07636ac4 (patch)
treeed533afdb31ac8ccc0426c6228cd9b0854c19ca0
parent1f18e092298a3ef3f0c65da26b0f09043a6896fb (diff)
downloadpoky-126227582a06fecb4971315be6aa72be07636ac4.tar.gz
linux-libc-headers: ptrace.h: remove ptrace_peeksiginfo_args
The addition of ptrace_peeksiginfo_args to the uapi in kernel commit 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)] means that existing applications using glibc versions that define ptrace_peeksiginfo_args in sys/ptrace.h will get duplicate structure definitions like: | In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0: | /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args' | struct ptrace_peeksiginfo_args { | ^ | In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0, | from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37: | /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8: note: originally defined here | struct ptrace_peeksiginfo_args | ^ | make[2]: *** [process.o] Error 1 Reverting to the previous status of not exporting this structure temporarily fixes applications, until they can be adjusted to not mix sys/ptrace.h and linux/ptrace.h includes. (From OE-Core rev: 7c207e4c3c0e3b575c67a302b97b0dc700a8fc15) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch50
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb2
2 files changed, 51 insertions, 1 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch
new file mode 100644
index 0000000000..da2e117a48
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch
@@ -0,0 +1,50 @@
1From 7dddfb8fec5317ea16154d30e8e18b6559979b60 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@windriver.com>
3Date: Sun, 25 Aug 2013 22:51:07 -0400
4Subject: [PATCH] ptrace.h: remove ptrace_peeksiginfo_args
5
6The addition of ptrace_peeksiginfo_args to the uapi in kernel commit
784c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)]
8means that existing applications using glibc versions that define ptrace_peeksiginfo_args
9in sys/ptrace.h will get duplicate structure definitions like:
10
11 | In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:
12 | /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args'
13 | struct ptrace_peeksiginfo_args {
14 | ^
15 | In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,
16 | from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:
17 | /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8: note: originally defined here
18 | struct ptrace_peeksiginfo_args
19 | ^
20 | make[2]: *** [process.o] Error 1
21
22Reverting to the previous status of not exporting this structure temporarily
23fixes applications, until they can be adjusted to not mix sys/ptrace.h and
24linux/ptrace.h includes.
25
26Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
27---
28 include/uapi/linux/ptrace.h | 6 ------
29 1 file changed, 6 deletions(-)
30
31diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h
32index 52ebcc8..524599d 100644
33--- a/include/uapi/linux/ptrace.h
34+++ b/include/uapi/linux/ptrace.h
35@@ -55,12 +55,6 @@
36
37 #define PTRACE_PEEKSIGINFO 0x4209
38
39-struct ptrace_peeksiginfo_args {
40- __u64 off; /* from which siginfo to start */
41- __u32 flags;
42- __s32 nr; /* how may siginfos to take */
43-};
44-
45 /* Read signals from a shared (process wide) queue */
46 #define PTRACE_PEEKSIGINFO_SHARED (1 << 0)
47
48--
491.7.10.4
50
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
index eb04367ce5..b2e6f0f643 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
@@ -1,6 +1,6 @@
1require linux-libc-headers.inc 1require linux-libc-headers.inc
2 2
3PR = "r0" 3SRC_URI += "file://0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch"
4 4
5SRC_URI[md5sum] = "72d0a9b3e60cd86fabcd3f24b1708944" 5SRC_URI[md5sum] = "72d0a9b3e60cd86fabcd3f24b1708944"
6SRC_URI[sha256sum] = "46c9e55e1fddf40813b8d697d5645037a8e2af5c1a8dff52b3fe82b5021582b8" 6SRC_URI[sha256sum] = "46c9e55e1fddf40813b8d697d5645037a8e2af5c1a8dff52b3fe82b5021582b8"