summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDike, Jeffrey G <jeffrey.g.dike@intel.com>2010-06-16 14:32:49 -0700
committerJoshua Lock <josh@linux.intel.com>2010-06-17 15:08:53 +0100
commitb43a425119bd18e73f0e4ddc65d15835cad4aaec (patch)
treedfe14b97ca37f34e7741a87b8817d4431621d4a8
parent01a588361686a2eee40018cdbb6f47051542e5bc (diff)
downloadpoky-b43a425119bd18e73f0e4ddc65d15835cad4aaec.tar.gz
linux-libc-headers: Remove ioctls for deleted driver
2.6.33 removed the Hayes ESP driver. The presence of these ioctls makes setserial believe that ESP support should be built in, breaking its build. Signed-off-by: Jeff Dike <jdike@linux.intel.com>
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers-2.6.33/hayes-gone.patch25
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers_2.6.33.bb5
2 files changed, 28 insertions, 2 deletions
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.33/hayes-gone.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.33/hayes-gone.patch
new file mode 100644
index 0000000000..dc6338a952
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.33/hayes-gone.patch
@@ -0,0 +1,25 @@
1# 2.6.33 deleted the Hayes esp driver, so the ioctls to get and set its
2# configuration are no longer needed, and they break setserial by making it
3# believe that it should compile in the code that supports this modem.
4
5Index: linux-2.6.33/include/asm-generic/ioctls.h
6===================================================================
7--- linux-2.6.33.orig/include/asm-generic/ioctls.h
8+++ linux-2.6.33/include/asm-generic/ioctls.h
9@@ -86,16 +86,6 @@
10 #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
11 #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
12
13-/*
14- * some architectures define FIOQSIZE as 0x545E, which is used for
15- * TIOCGHAYESESP on others
16- */
17-#ifndef FIOQSIZE
18-# define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
19-# define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
20-# define FIOQSIZE 0x5460
21-#endif
22-
23 /* Used for packet mode */
24 #define TIOCPKT_DATA 0
25 #define TIOCPKT_FLUSHREAD 1
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.33.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.33.bb
index e706988070..4a63910e82 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.33.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.33.bb
@@ -2,9 +2,10 @@ require linux-libc-headers.inc
2 2
3INHIBIT_DEFAULT_DEPS = "1" 3INHIBIT_DEFAULT_DEPS = "1"
4DEPENDS += "unifdef-native" 4DEPENDS += "unifdef-native"
5PR = "r0" 5PR = "r1"
6 6
7SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2" 7SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
8 file://hayes-gone.patch"
8 9
9S = "${WORKDIR}/linux-${PV}" 10S = "${WORKDIR}/linux-${PV}"
10 11