diff options
Diffstat (limited to 'recipes-extended/rxtx/files/kfreebsd_port.patch')
-rw-r--r-- | recipes-extended/rxtx/files/kfreebsd_port.patch | 309 |
1 files changed, 309 insertions, 0 deletions
diff --git a/recipes-extended/rxtx/files/kfreebsd_port.patch b/recipes-extended/rxtx/files/kfreebsd_port.patch new file mode 100644 index 0000000..b5fa172 --- /dev/null +++ b/recipes-extended/rxtx/files/kfreebsd_port.patch | |||
@@ -0,0 +1,309 @@ | |||
1 | Description: Defines FreeBSD for kFreeBSD systems, also makes sure kfreeBSD is set to use FHS | ||
2 | #grep -r -H "__FreeBSD" . -m 1 --exclude=*.patch --exclude-dir=.git | cut -d: -f1 | xargs sed -i s/__FreeBSD__/__FreeBSD_kernel__/ | ||
3 | Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585089 | ||
4 | Author: Scott Howard <showard@debian.org> | ||
5 | |||
6 | Index: rxtx/src/RS485Imp.c | ||
7 | =================================================================== | ||
8 | --- rxtx.orig/src/RS485Imp.c 2011-02-23 22:53:43.393378664 -0500 | ||
9 | +++ rxtx/src/RS485Imp.c 2011-02-23 22:53:52.663072550 -0500 | ||
10 | @@ -120,11 +120,11 @@ | ||
11 | threads, because it slows things down. Go figure. */ | ||
12 | |||
13 | /* POSIX signal handling functions */ | ||
14 | -#if !defined(__FreeBSD___) | ||
15 | +#if !defined(__FreeBSD_kernel___) | ||
16 | struct sigaction handler; | ||
17 | sigaction( SIGIO, NULL, &handler ); | ||
18 | if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); | ||
19 | -#endif /* !__FreeBSD__ */ | ||
20 | +#endif /* !__FreeBSD_kernel__ */ | ||
21 | #if defined(__linux__) | ||
22 | /* Lets let people who upgraded kernels know they may have problems */ | ||
23 | if (uname (&name) == -1) | ||
24 | @@ -178,7 +178,7 @@ | ||
25 | ttyset.c_cc[ VMIN ] = 0; | ||
26 | ttyset.c_cc[ VTIME ] = 0; | ||
27 | |||
28 | -#ifdef __FreeBSD__ | ||
29 | +#ifdef __FreeBSD_kernel__ | ||
30 | if( cfsetspeed( &ttyset, B9600 ) < 0 ) goto fail; | ||
31 | #else | ||
32 | if( cfsetispeed( &ttyset, B9600 ) < 0 ) goto fail; | ||
33 | @@ -238,7 +238,7 @@ | ||
34 | if( !translate_data_bits( env, (int *)&(ttyset.c_cflag), dataBits ) ) return; /* dima c_cflag in darwin is unsigned long */ | ||
35 | if( !translate_stop_bits( env, (int *)&(ttyset.c_cflag), stopBits ) ) return; /* dima c_cflag in darwin is unsigned long */ | ||
36 | if( !translate_parity( env, (int *)&(ttyset.c_cflag), parity ) ) return;/* dima c_cflag in darwin is unsigned long */ | ||
37 | -#ifdef __FreeBSD__ | ||
38 | +#ifdef __FreeBSD_kernel__ | ||
39 | if( cfsetspeed( &ttyset, cspeed ) < 0 ) goto fail; | ||
40 | #else | ||
41 | if( cfsetispeed( &ttyset, cspeed ) < 0 ) goto fail; | ||
42 | @@ -1290,7 +1290,7 @@ | ||
43 | return(JNI_FALSE); | ||
44 | } | ||
45 | #endif | ||
46 | -#if defined(__FreeBSD__) | ||
47 | +#if defined(__FreeBSD_kernel__) | ||
48 | if(!strcmp(name,"tty0")|| !strcmp(name,"ttyd")|| | ||
49 | !strcmp(name,"ttyq")|| !strcmp(name,"ttym")|| | ||
50 | !strcmp(name,"ttyf")|| !strcmp(name,"ttyS")|| | ||
51 | Index: rxtx/src/RawImp.c | ||
52 | =================================================================== | ||
53 | --- rxtx.orig/src/RawImp.c 2011-02-23 22:53:43.413378002 -0500 | ||
54 | +++ rxtx/src/RawImp.c 2011-02-23 22:53:52.663072550 -0500 | ||
55 | @@ -265,11 +265,11 @@ | ||
56 | threads, because it slows things down. Go figure. */ | ||
57 | |||
58 | /* POSIX signal handling functions */ | ||
59 | -#if !defined(__FreeBSD___) | ||
60 | +#if !defined(__FreeBSD_kernel___) | ||
61 | struct sigaction handler; | ||
62 | sigaction( SIGIO, NULL, &handler ); | ||
63 | if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); | ||
64 | -#endif /* !__FreeBSD__ */ | ||
65 | +#endif /* !__FreeBSD_kernel__ */ | ||
66 | #if defined(__linux__) | ||
67 | /* Lets let people who upgraded kernels know they may have problems */ | ||
68 | if (uname (&name) == -1) | ||
69 | @@ -307,7 +307,7 @@ | ||
70 | if( !translate_data_bits( env, (int *)&(ttyset.c_cflag), dataBits ) ) return; /* dima c_flag darwin unsigned long */ | ||
71 | if( !translate_stop_bits( env, (int *)&(ttyset.c_cflag), stopBits ) ) return; /* dima c_flag darwin unsigned long */ | ||
72 | if( !translate_parity( env, (int *)&(ttyset.c_cflag), parity ) ) return;/* dima c_flag darwin unsigned long */ | ||
73 | -#ifdef __FreeBSD__ | ||
74 | +#ifdef __FreeBSD_kernel__ | ||
75 | if( cfsetspeed( &ttyset, cspeed ) < 0 ) goto fail; | ||
76 | #else | ||
77 | if( cfsetispeed( &ttyset, cspeed ) < 0 ) goto fail; | ||
78 | @@ -1289,7 +1289,7 @@ | ||
79 | return(JNI_FALSE); | ||
80 | } | ||
81 | #endif | ||
82 | -#if defined(__FreeBSD__) | ||
83 | +#if defined(__FreeBSD_kernel__) | ||
84 | if(!strcmp(name,"tty0")|| !strcmp(name,"ttyd")|| | ||
85 | !strcmp(name,"ttyq")|| !strcmp(name,"ttym")|| | ||
86 | !strcmp(name,"ttyf")|| !strcmp(name,"ttyS")|| | ||
87 | Index: rxtx/src/SerialImp.h | ||
88 | =================================================================== | ||
89 | --- rxtx.orig/src/SerialImp.h 2011-02-23 22:53:43.423377671 -0500 | ||
90 | +++ rxtx/src/SerialImp.h 2011-02-23 22:55:45.573475048 -0500 | ||
91 | @@ -97,7 +97,7 @@ | ||
92 | |||
93 | /* glue for unsupported linux speeds see also win32termios.h */ | ||
94 | |||
95 | -#if !defined(__APPLE__) && !defined(__FreeBSD__) /* dima */ | ||
96 | +#if !defined(__APPLE__) && !defined(__FreeBSD_kernel__) /* dima */ | ||
97 | /* this is now handled in SerialImp.c | ||
98 | #define B14400 1010001 | ||
99 | #define B28800 1010002 | ||
100 | @@ -147,7 +147,7 @@ | ||
101 | }; | ||
102 | |||
103 | /* Ports known on the OS */ | ||
104 | -#if defined(__linux__) | ||
105 | +#if defined(__linux__) || defined(__FreeBSD_kernel__) | ||
106 | /* | ||
107 | This is a small hack to get mark and space parity working on older systems | ||
108 | https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=147533 | ||
109 | Index: rxtx/src/SerialImp.c | ||
110 | =================================================================== | ||
111 | --- rxtx.orig/src/SerialImp.c 2011-02-23 22:53:43.443377009 -0500 | ||
112 | +++ rxtx/src/SerialImp.c 2011-02-23 22:53:52.663072550 -0500 | ||
113 | @@ -423,7 +423,7 @@ | ||
114 | ttyset.c_cc[ VMIN ] = 0; | ||
115 | ttyset.c_cc[ VTIME ] = 0; | ||
116 | |||
117 | -#ifdef __FreeBSD__ | ||
118 | +#ifdef __FreeBSD_kernel__ | ||
119 | if( cfsetspeed( &ttyset, B9600 ) < 0 ) goto fail; | ||
120 | #else | ||
121 | if( cfsetispeed( &ttyset, B9600 ) < 0 ) goto fail; | ||
122 | @@ -844,13 +844,13 @@ | ||
123 | return(1); | ||
124 | } | ||
125 | |||
126 | -#ifdef __FreeBSD__ | ||
127 | +#ifdef __FreeBSD_kernel__ | ||
128 | if( cfsetspeed( &ttyset, cspeed ) < 0 ) | ||
129 | { | ||
130 | report( "set_port_params: Cannot Set Speed\n" ); | ||
131 | return( 1 ); | ||
132 | } | ||
133 | -#endif /* __FreeBSD__ */ | ||
134 | +#endif /* __FreeBSD_kernel__ */ | ||
135 | if( !cspeed ) | ||
136 | { | ||
137 | /* hang up the modem aka drop DTR */ | ||
138 | @@ -4705,7 +4705,7 @@ | ||
139 | stat(teststring,&mystat); | ||
140 | #endif /* __sun__ */ | ||
141 | /* XXX the following hoses freebsd when it tries to open the port later on */ | ||
142 | -#ifndef __FreeBSD__ | ||
143 | +#ifndef __FreeBSD_kernel__ | ||
144 | if(S_ISCHR(mystat.st_mode)){ | ||
145 | fd=OPEN(teststring,O_RDONLY|O_NONBLOCK); | ||
146 | if (fd>0){ | ||
147 | Index: rxtx/src/ParallelImp.c | ||
148 | =================================================================== | ||
149 | --- rxtx.orig/src/ParallelImp.c 2011-02-23 22:53:43.463376347 -0500 | ||
150 | +++ rxtx/src/ParallelImp.c 2011-02-23 22:53:52.663072550 -0500 | ||
151 | @@ -111,7 +111,7 @@ | ||
152 | #if defined(__linux__) | ||
153 | # include <linux/lp.h> | ||
154 | #endif | ||
155 | -#if defined(__FreeBSD__) | ||
156 | +#if defined(__FreeBSD_kernel__) | ||
157 | /* # include <machine/lpt.h> ? is this changed or wrong */ | ||
158 | # include <dev/ppbus/lpt.h> | ||
159 | #endif | ||
160 | @@ -265,7 +265,7 @@ | ||
161 | #if defined(__linux__) | ||
162 | return( status & LP_BUSY ? JNI_TRUE : JNI_FALSE ); | ||
163 | #endif | ||
164 | -#if defined(__FreeBSD__) | ||
165 | +#if defined(__FreeBSD_kernel__) | ||
166 | return( status & EBUSY ? JNI_TRUE : JNI_FALSE ); | ||
167 | #endif | ||
168 | return(JNI_FALSE); | ||
169 | @@ -341,7 +341,7 @@ | ||
170 | ioctl(fd, LPGETSTATUS, &status); | ||
171 | return( status & LP_BUSY ? JNI_TRUE : JNI_FALSE ); | ||
172 | #endif | ||
173 | -#if defined(__FreeBSD__) | ||
174 | +#if defined(__FreeBSD_kernel__) | ||
175 | printf("ParallelImp.c LPGETSTATUS not defined\n"); | ||
176 | /* | ||
177 | return( status & EBUSY ? JNI_TRUE : JNI_FALSE ); | ||
178 | Index: rxtx/src/I2CImp.c | ||
179 | =================================================================== | ||
180 | --- rxtx.orig/src/I2CImp.c 2011-02-23 22:53:43.483375685 -0500 | ||
181 | +++ rxtx/src/I2CImp.c 2011-02-23 22:53:52.663072550 -0500 | ||
182 | @@ -120,11 +120,11 @@ | ||
183 | threads, because it slows things down. Go figure. */ | ||
184 | |||
185 | /* POSIX signal handling functions */ | ||
186 | -#if !defined(__FreeBSD___) | ||
187 | +#if !defined(__FreeBSD_kernel___) | ||
188 | struct sigaction handler; | ||
189 | sigaction( SIGIO, NULL, &handler ); | ||
190 | if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); | ||
191 | -#endif /* !__FreeBSD__ */ | ||
192 | +#endif /* !__FreeBSD_kernel__ */ | ||
193 | #if defined(__linux__) | ||
194 | /* Lets let people who upgraded kernels know they may have problems */ | ||
195 | if (uname (&name) == -1) | ||
196 | @@ -178,7 +178,7 @@ | ||
197 | ttyset.c_cc[ VMIN ] = 0; | ||
198 | ttyset.c_cc[ VTIME ] = 0; | ||
199 | |||
200 | -#ifdef __FreeBSD__ | ||
201 | +#ifdef __FreeBSD_kernel__ | ||
202 | if( cfsetspeed( &ttyset, B9600 ) < 0 ) goto fail; | ||
203 | #else | ||
204 | if( cfsetispeed( &ttyset, B9600 ) < 0 ) goto fail; | ||
205 | @@ -238,7 +238,7 @@ | ||
206 | if( !translate_data_bits( env, (int *)&(ttyset.c_cflag), dataBits ) ) return; /* dima darwin defime c_cflag as unsigned long */ | ||
207 | if( !translate_stop_bits( env, (int *)&(ttyset.c_cflag), stopBits ) ) return; /* dima darwin defime c_cflag as unsigned long */ | ||
208 | if( !translate_parity( env, (int *)&(ttyset.c_cflag), parity ) ) return;/* dima darwin defime c_cflag as unsigned long */ | ||
209 | -#ifdef __FreeBSD__ | ||
210 | +#ifdef __FreeBSD_kernel__ | ||
211 | if( cfsetspeed( &ttyset, cspeed ) < 0 ) goto fail; | ||
212 | #else | ||
213 | if( cfsetispeed( &ttyset, cspeed ) < 0 ) goto fail; | ||
214 | @@ -1220,7 +1220,7 @@ | ||
215 | return(JNI_FALSE); | ||
216 | } | ||
217 | #endif | ||
218 | -#if defined(__FreeBSD__) | ||
219 | +#if defined(__FreeBSD_kernel__) | ||
220 | if(!strcmp(name,"tty0")|| !strcmp(name,"ttyd")|| | ||
221 | !strcmp(name,"ttyq")|| !strcmp(name,"ttym")|| | ||
222 | !strcmp(name,"ttyf")|| !strcmp(name,"ttyS")|| | ||
223 | Index: rxtx/src/SerialImp.cpp | ||
224 | =================================================================== | ||
225 | --- rxtx.orig/src/SerialImp.cpp 2011-02-23 22:53:43.503375023 -0500 | ||
226 | +++ rxtx/src/SerialImp.cpp 2011-02-23 22:53:52.663072550 -0500 | ||
227 | @@ -135,11 +135,11 @@ | ||
228 | threads, because it slows things down. Go figure. */ | ||
229 | |||
230 | /* POSIX signal handling functions */ | ||
231 | -#if !defined(__FreeBSD___) | ||
232 | +#if !defined(__FreeBSD_kernel___) | ||
233 | struct sigaction handler; | ||
234 | sigaction( SIGIO, NULL, &handler ); | ||
235 | if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); | ||
236 | -#endif /* !__FreeBSD__ */ | ||
237 | +#endif /* !__FreeBSD_kernel__ */ | ||
238 | #ifdef DEBUG | ||
239 | /* Lets let people who upgraded kernels know they may have problems */ | ||
240 | if (uname (&name) == -1) | ||
241 | Index: rxtx/CNI/SerialImp.h | ||
242 | =================================================================== | ||
243 | --- rxtx.orig/CNI/SerialImp.h 2011-02-23 22:53:43.523374359 -0500 | ||
244 | +++ rxtx/CNI/SerialImp.h 2011-02-23 22:53:52.663072550 -0500 | ||
245 | @@ -97,7 +97,7 @@ | ||
246 | |||
247 | /* glue for unsupported linux speeds see also win32termios.h */ | ||
248 | |||
249 | -#if !defined(__APPLE__) && !defined(__FreeBSD__) /* dima */ | ||
250 | +#if !defined(__APPLE__) && !defined(__FreeBSD_kernel__) /* dima */ | ||
251 | /* this is now handled in SerialImp.c | ||
252 | #define B14400 1010001 | ||
253 | #define B28800 1010002 | ||
254 | @@ -165,7 +165,7 @@ | ||
255 | # define LOCKFILEPREFIX "LK." | ||
256 | # define UUCP | ||
257 | #endif /* __sgi__ || sgi */ | ||
258 | -#if defined(__FreeBSD__) | ||
259 | +#if defined(__FreeBSD_kernel__) | ||
260 | # define DEVICEDIR "/dev/" | ||
261 | # define LOCKDIR "/var/spool/uucp" | ||
262 | # define LOCKFILEPREFIX "LK." | ||
263 | @@ -176,7 +176,7 @@ | ||
264 | # define LOCKDIR "/var/spool/uucp" | ||
265 | # define LOCKFILEPREFIX "LK." | ||
266 | # define UUCP | ||
267 | -#endif /* __FreeBSD__ */ | ||
268 | +#endif /* __FreeBSD_kernel__ */ | ||
269 | #if defined(__NetBSD__) | ||
270 | # define DEVICEDIR "/dev/" | ||
271 | # define LOCKDIR "/usr/spool/uucp" | ||
272 | Index: rxtx/CNI/SerialImp.c | ||
273 | =================================================================== | ||
274 | --- rxtx.orig/CNI/SerialImp.c 2011-02-23 22:53:43.543373697 -0500 | ||
275 | +++ rxtx/CNI/SerialImp.c 2011-02-23 22:53:52.663072550 -0500 | ||
276 | @@ -382,7 +382,7 @@ | ||
277 | ttyset.c_cc[ VMIN ] = 0; | ||
278 | ttyset.c_cc[ VTIME ] = 0; | ||
279 | |||
280 | -#ifdef __FreeBSD__ | ||
281 | +#ifdef __FreeBSD_kernel__ | ||
282 | if( cfsetspeed( &ttyset, B9600 ) < 0 ) goto fail; | ||
283 | #else | ||
284 | if( cfsetispeed( &ttyset, B9600 ) < 0 ) goto fail; | ||
285 | @@ -686,13 +686,13 @@ | ||
286 | return(1); | ||
287 | } | ||
288 | |||
289 | -#ifdef __FreeBSD__ | ||
290 | +#ifdef __FreeBSD_kernel__ | ||
291 | if( cfsetspeed( &ttyset, cspeed ) < 0 ) | ||
292 | { | ||
293 | report( "set_port_params: Cannot Set Speed\n" ); | ||
294 | return( 1 ); | ||
295 | } | ||
296 | -#endif /* __FreeBSD__ */ | ||
297 | +#endif /* __FreeBSD_kernel__ */ | ||
298 | if( !cspeed ) | ||
299 | { | ||
300 | /* hang up the modem aka drop DTR */ | ||
301 | @@ -4257,7 +4257,7 @@ | ||
302 | stat(teststring,&mystat); | ||
303 | #endif /* __sun__ */ | ||
304 | /* XXX the following hoses freebsd when it tries to open the port later on */ | ||
305 | -#ifndef __FreeBSD__ | ||
306 | +#ifndef __FreeBSD_kernel__ | ||
307 | if(S_ISCHR(mystat.st_mode)){ | ||
308 | fd=::OPEN(teststring,O_RDONLY|O_NONBLOCK); | ||
309 | if (fd>0){ | ||