diff options
| author | Eric Sandall | 2009-02-06 22:18:48 -0800 |
|---|---|---|
| committer | Arwed von Merkatz | 2009-02-10 17:51:04 +0100 |
| commit | 753b0be99e23e4d2e043c3b147ea47b9f657f7e1 (patch) | |
| tree | 83f14d224afd113ae44c6979908092f64a1cd0a6 | |
| parent | ed87b87a83d0a29f7dd6504a73b6a6b3ae6ccaee (diff) | |
kbd: Include linux/types.h before linux/serial.h
Based on Julien's hal/probe-serial.patch
Fixes Bug#15064
(cherry picked from commit 0234d7a9510c34b15886d5379903f215359cc522)
| -rw-r--r-- | utils/kbd/HISTORY | 6 | ||||
| -rwxr-xr-x | utils/kbd/PRE_BUILD | 3 | ||||
| -rw-r--r-- | utils/kbd/fgconsole-serial.patch | 11 |
3 files changed, 20 insertions, 0 deletions
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY index c397f89ee8..8edd10107a 100644 --- a/utils/kbd/HISTORY +++ b/utils/kbd/HISTORY @@ -1,3 +1,9 @@ +2009-02-06 Eric Sandall <sandalle@sourcemage.org> + * fgconsole-serial.patch: Include linux/types.h before linux/serial.h + Based on Julien's hal/probe-serial.patch + Fixes Bug#15064 + * PRE_BUILD: Apply fgconsole-serial.patch + 2008-12-25 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 1.15 * PRE_BUILD, configure.patch: removed diff --git a/utils/kbd/PRE_BUILD b/utils/kbd/PRE_BUILD new file mode 100755 index 0000000000..dbdaee491d --- /dev/null +++ b/utils/kbd/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +patch -p1 < $SPELL_DIRECTORY/fgconsole-serial.patch diff --git a/utils/kbd/fgconsole-serial.patch b/utils/kbd/fgconsole-serial.patch new file mode 100644 index 0000000000..d3ac176a6d --- /dev/null +++ b/utils/kbd/fgconsole-serial.patch @@ -0,0 +1,11 @@ +diff -Naur kbd-1.15.orig/src/fgconsole.c kbd-1.15/src/fgconsole.c +--- kbd-1.15.orig/src/fgconsole.c 2009-02-06 22:13:57.437214875 -0800 ++++ kbd-1.15/src/fgconsole.c 2009-02-06 22:15:17.832978146 -0800 +@@ -6,6 +6,7 @@ + #include <sys/ioctl.h> + #include <getopt.h> + #include <linux/vt.h> ++#include <linux/types.h> + #include <linux/serial.h> + #include "getfd.h" + #include "nls.h" |