setserial: fix build with 2.6.33+ kernel headers on x86

linux/hayesesp.h got removed in 2.6.33, but some archs (like x86) still
define the TIOCGHAYESESP ioctl, breaking the build.

It's very unlikely to be of interest anymore, so just undef it.

Reported-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index f1edd164e5d0a2c7c9bb7e037d86e7e8e7df2fe5..dce7efb31562f9022f91545abc71b2a6fb0e4fca 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,7 @@
        X.org updated to 7.5.
 
        Updated/fixed packages: busybox, dosfstools, e2fsprogs,
-       mtd-utils, squashfs
+       mtd-utils, setserial, squashfs
 
        Issues resolved (http://bugs.uclibc.org):
 

diff --git a/package/setserial/setserial-tiocghayesesp-build-fix.patch b/package/setserial/setserial-tiocghayesesp-build-fix.patch
new file mode 100644 (file)
index 0000000..176a0c9
--- /dev/null
+++ b/package/setserial/setserial-tiocghayesesp-build-fix.patch
@@ -0,0 +1,28 @@
+[PATCH] setserial: fix build with 2.6.33+ kernel headers
+
+linux/hayesesp.h got removed in 2.6.33, but some archs (like x86) still
+define the TIOCGHAYESESP ioctl, breaking the build.
+
+It's very unlikely to be of interest anymore, so just undef it.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ setserial.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: setserial-2.17/setserial.c
+===================================================================
+--- setserial-2.17.orig/setserial.c
++++ setserial-2.17/setserial.c
+@@ -24,6 +24,11 @@
+ #endif
+ #include <linux/serial.h>
+ 
++/* linux/hayesesp.h got removed in 2.6.33 but some archs (like x86)
++   still define TIOCGHAYESESP. It's very unlikely to be of interest
++   anymore, so just undef it */
++#undef TIOCGHAYESESP
++
+ #include "version.h"
+ 
+ static char version_str[] = "setserial version " SETSERIAL_VERSION ", "