diff options
Diffstat (limited to 'meta/recipes-devtools/strace/strace-4.7/0029-Filter-out-redundant-32-ioctl-entries.patch')
-rw-r--r-- | meta/recipes-devtools/strace/strace-4.7/0029-Filter-out-redundant-32-ioctl-entries.patch | 145 |
1 files changed, 0 insertions, 145 deletions
diff --git a/meta/recipes-devtools/strace/strace-4.7/0029-Filter-out-redundant-32-ioctl-entries.patch b/meta/recipes-devtools/strace/strace-4.7/0029-Filter-out-redundant-32-ioctl-entries.patch deleted file mode 100644 index de9440dcbb..0000000000 --- a/meta/recipes-devtools/strace/strace-4.7/0029-Filter-out-redundant-32-ioctl-entries.patch +++ /dev/null | |||
@@ -1,145 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From 17e3860ee8684b397b99eea59b6458a8a7b88f5c Mon Sep 17 00:00:00 2001 | ||
4 | From: "Dmitry V. Levin" <ldv@altlinux.org> | ||
5 | Date: Sat, 27 Oct 2012 01:11:13 +0000 | ||
6 | Subject: [PATCH 29/31] Filter out redundant "*32" ioctl entries | ||
7 | |||
8 | * linux/ioctlent-filter.awk: New file. | ||
9 | * Makefile.am: Use it. | ||
10 | * linux/ioctlent.h.in: Removed redundant "*32" entries. | ||
11 | --- | ||
12 | Makefile.am | 3 ++- | ||
13 | linux/ioctlent-filter.awk | 19 +++++++++++++++++++ | ||
14 | linux/ioctlent.h.in | 14 -------------- | ||
15 | 3 files changed, 21 insertions(+), 15 deletions(-) | ||
16 | create mode 100644 linux/ioctlent-filter.awk | ||
17 | |||
18 | diff --git a/Makefile.am b/Makefile.am | ||
19 | index 3e8c810..aa1a5f4 100644 | ||
20 | --- a/Makefile.am | ||
21 | +++ b/Makefile.am | ||
22 | @@ -151,4 +151,5 @@ $(ioctlent_h): $(top_builddir)/config.status $(ioctlent_h_deps) | ||
23 | $(MKDIR_P) $(builddir)/$(OS) | ||
24 | cat $(ioctlent_h_deps) | \ | ||
25 | $(COMPILE) -E -P - | \ | ||
26 | - LC_ALL=C sort -u -k3,3 -k2,2 > $@ | ||
27 | + LC_ALL=C sort -u -k3,3 -k2,2 | \ | ||
28 | + awk -f $(srcdir)/linux/ioctlent-filter.awk > $@ | ||
29 | diff --git a/linux/ioctlent-filter.awk b/linux/ioctlent-filter.awk | ||
30 | new file mode 100644 | ||
31 | index 0000000..181c4bf | ||
32 | --- /dev/null | ||
33 | +++ b/linux/ioctlent-filter.awk | ||
34 | @@ -0,0 +1,19 @@ | ||
35 | +#!/bin/awk -f | ||
36 | +# Filter out redundant "*32" symbols. | ||
37 | + | ||
38 | +BEGIN { | ||
39 | + s="" | ||
40 | + c="" | ||
41 | +} | ||
42 | + | ||
43 | +NF == 3 && $2 ~ /^"[^",]*",$/ { | ||
44 | + if ($2 == s && $3 == c) | ||
45 | + next | ||
46 | + s = $2 | ||
47 | + sub(/",$/, "32\",", s) | ||
48 | + c = $3 | ||
49 | +} | ||
50 | + | ||
51 | +{ | ||
52 | |||
53 | +} | ||
54 | diff --git a/linux/ioctlent.h.in b/linux/ioctlent.h.in | ||
55 | index 98ebbcc..895070c 100644 | ||
56 | --- a/linux/ioctlent.h.in | ||
57 | +++ b/linux/ioctlent.h.in | ||
58 | @@ -103,7 +103,6 @@ | ||
59 | {"linux/fs.h", "BLKBSZSET", 0x1271}, | ||
60 | {"linux/fs.h", "BLKGETSIZE64", 0x1272}, | ||
61 | {"linux/fs.h", "BLKTRACESETUP", 0x1273}, | ||
62 | - {"linux/blktrace_api.h", "BLKTRACESETUP32", 0x1273}, | ||
63 | {"linux/fs.h", "BLKTRACESTART", 0x1274}, | ||
64 | {"linux/fs.h", "BLKTRACESTOP", 0x1275}, | ||
65 | {"linux/fs.h", "BLKTRACETEARDOWN", 0x1276}, | ||
66 | @@ -257,14 +256,12 @@ | ||
67 | {"linux/cciss_ioctl.h", "CCISS_GETDRIVVER", 0x4209}, | ||
68 | {"linux/cciss_ioctl.h", "CCISS_REVALIDVOLS", 0x420a}, | ||
69 | {"linux/cciss_ioctl.h", "CCISS_PASSTHRU", 0x420b}, | ||
70 | - {"linux/cciss_ioctl.h", "CCISS_PASSTHRU32", 0x420b}, | ||
71 | {"linux/cciss_ioctl.h", "CCISS_DEREGDISK", 0x420c}, | ||
72 | {"linux/cciss_ioctl.h", "CCISS_REGNEWDISK", 0x420d}, | ||
73 | {"linux/cciss_ioctl.h", "CCISS_REGNEWD", 0x420e}, | ||
74 | {"linux/cciss_ioctl.h", "CCISS_RESCANDISK", 0x4210}, | ||
75 | {"linux/cciss_ioctl.h", "CCISS_GETLUNINFO", 0x4211}, | ||
76 | {"linux/cciss_ioctl.h", "CCISS_BIG_PASSTHRU", 0x4212}, | ||
77 | - {"linux/cciss_ioctl.h", "CCISS_BIG_PASSTHRU32", 0x4212}, | ||
78 | {"linux/soundcard.h", "SNDCTL_COPR_RESET", 0x4300}, | ||
79 | {"linux/capi.h", "CAPI_REGISTER", 0x4301}, | ||
80 | {"linux/soundcard.h", "SNDCTL_COPR_LOAD", 0x4301}, | ||
81 | @@ -775,25 +772,19 @@ | ||
82 | {"linux/if_tun.h", "TUNSETVNETHDRSZ", 0x54d8}, | ||
83 | {"sound/asound.h", "SNDRV_CTL_IOCTL_PVERSION", 0x5500}, | ||
84 | {"linux/usbdevice_fs.h", "USBDEVFS_CONTROL", 0x5500}, | ||
85 | - {"linux/usbdevice_fs.h", "USBDEVFS_CONTROL32", 0x5500}, | ||
86 | {"sound/asound.h", "SNDRV_CTL_IOCTL_CARD_INFO", 0x5501}, | ||
87 | {"linux/uinput.h", "UI_DEV_CREATE", 0x5501}, | ||
88 | {"linux/uinput.h", "UI_DEV_DESTROY", 0x5502}, | ||
89 | {"linux/usbdevice_fs.h", "USBDEVFS_BULK", 0x5502}, | ||
90 | - {"linux/usbdevice_fs.h", "USBDEVFS_BULK32", 0x5502}, | ||
91 | {"linux/usbdevice_fs.h", "USBDEVFS_RESETEP", 0x5503}, | ||
92 | {"linux/usbdevice_fs.h", "USBDEVFS_SETINTERFACE", 0x5504}, | ||
93 | {"linux/usbdevice_fs.h", "USBDEVFS_SETCONFIGURATION", 0x5505}, | ||
94 | {"linux/usbdevice_fs.h", "USBDEVFS_GETDRIVER", 0x5508}, | ||
95 | {"linux/usbdevice_fs.h", "USBDEVFS_SUBMITURB", 0x550a}, | ||
96 | - {"linux/usbdevice_fs.h", "USBDEVFS_SUBMITURB32", 0x550a}, | ||
97 | {"linux/usbdevice_fs.h", "USBDEVFS_DISCARDURB", 0x550b}, | ||
98 | {"linux/usbdevice_fs.h", "USBDEVFS_REAPURB", 0x550c}, | ||
99 | - {"linux/usbdevice_fs.h", "USBDEVFS_REAPURB32", 0x550c}, | ||
100 | {"linux/usbdevice_fs.h", "USBDEVFS_REAPURBNDELAY", 0x550d}, | ||
101 | - {"linux/usbdevice_fs.h", "USBDEVFS_REAPURBNDELAY32", 0x550d}, | ||
102 | {"linux/usbdevice_fs.h", "USBDEVFS_DISCSIGNAL", 0x550e}, | ||
103 | - {"linux/usbdevice_fs.h", "USBDEVFS_DISCSIGNAL32", 0x550e}, | ||
104 | {"linux/usbdevice_fs.h", "USBDEVFS_CLAIMINTERFACE", 0x550f}, | ||
105 | {"sound/asound.h", "SNDRV_CTL_IOCTL_ELEM_LIST", 0x5510}, | ||
106 | {"linux/usbdevice_fs.h", "USBDEVFS_RELEASEINTERFACE", 0x5510}, | ||
107 | @@ -801,7 +792,6 @@ | ||
108 | {"linux/usbdevice_fs.h", "USBDEVFS_CONNECTINFO", 0x5511}, | ||
109 | {"sound/asound.h", "SNDRV_CTL_IOCTL_ELEM_READ", 0x5512}, | ||
110 | {"linux/usbdevice_fs.h", "USBDEVFS_IOCTL", 0x5512}, | ||
111 | - {"linux/usbdevice_fs.h", "USBDEVFS_IOCTL32", 0x5512}, | ||
112 | {"sound/asound.h", "SNDRV_CTL_IOCTL_ELEM_WRITE", 0x5513}, | ||
113 | {"linux/usbdevice_fs.h", "USBDEVFS_HUB_PORTINFO", 0x5513}, | ||
114 | {"sound/asound.h", "SNDRV_CTL_IOCTL_ELEM_LOCK", 0x5514}, | ||
115 | @@ -1119,7 +1109,6 @@ | ||
116 | {"linux/ipmi.h", "IPMICTL_RECEIVE_MSG_TRUNC", 0x690b}, | ||
117 | {"media/lirc.h", "LIRC_GET_MAX_FILTER_PULSE", 0x690b}, | ||
118 | {"linux/i2o-dev.h", "I2OPASSTHRU", 0x690c}, | ||
119 | - {"linux/i2o-dev.h", "I2OPASSTHRU32", 0x690c}, | ||
120 | {"linux/ipmi.h", "IPMICTL_RECEIVE_MSG", 0x690c}, | ||
121 | {"media/lirc.h", "LIRC_GET_MIN_FILTER_SPACE", 0x690c}, | ||
122 | {"linux/ipmi.h", "IPMICTL_SEND_COMMAND", 0x690d}, | ||
123 | @@ -1194,11 +1183,9 @@ | ||
124 | {"linux/udf_fs_i.h", "UDF_GETVOLIDENT", 0x6c42}, | ||
125 | {"linux/udf_fs_i.h", "UDF_RELOCATE_BLOCKS", 0x6c43}, | ||
126 | {"linux/synclink.h", "MGSL_IOCSPARAMS", 0x6d00}, | ||
127 | - {"linux/synclink.h", "MGSL_IOCSPARAMS32", 0x6d00}, | ||
128 | {"linux/mmtimer.h", "MMTIMER_GETOFFSET", 0x6d00}, | ||
129 | {"linux/soundcard.h", "SNDCTL_MIDI_PRETIME", 0x6d00}, | ||
130 | {"linux/synclink.h", "MGSL_IOCGPARAMS", 0x6d01}, | ||
131 | - {"linux/synclink.h", "MGSL_IOCGPARAMS32", 0x6d01}, | ||
132 | {"linux/mmtimer.h", "MMTIMER_GETRES", 0x6d01}, | ||
133 | {"linux/msm_mdp.h", "MSMFB_GRP_DISP", 0x6d01}, | ||
134 | {"linux/mtio.h", "MTIOCTOP", 0x6d01}, | ||
135 | @@ -1754,7 +1741,6 @@ | ||
136 | {"linux/auto_fs.h", "AUTOFS_IOC_CATATONIC", 0x9362}, | ||
137 | {"linux/auto_fs.h", "AUTOFS_IOC_PROTOVER", 0x9363}, | ||
138 | {"linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT", 0x9364}, | ||
139 | - {"linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT32", 0x9364}, | ||
140 | {"linux/auto_fs.h", "AUTOFS_IOC_EXPIRE", 0x9365}, | ||
141 | {"linux/auto_fs4.h", "AUTOFS_IOC_EXPIRE_MULTI", 0x9366}, | ||
142 | {"linux/auto_fs4.h", "AUTOFS_IOC_PROTOSUBVER", 0x9367}, | ||
143 | -- | ||
144 | 1.8.0 | ||
145 | |||