[oe-commits] org.oe.dev merge of 'bb3574ca77780e28d3528182eaeb7cda963c4974'

[rpurdie commit]

merge of 'bb3574ca77780e28d3528182eaeb7cda963c4974'
     and 'eea0b13e3079e07cf547a5690026863e07e011bf'

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 6bcbba52935837d8cc6bbd2b56f5836157870682
ViewMTN: http://monotone.openembedded.org/revision/info/6bcbba52935837d8cc6bbd2b56f5836157870682
Files:
1
conf/machine/h5000.conf
packages/tasks/task-base.bb
packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch
packages/xorg-xserver/xserver-kdrive_1.4.bb
Diffs:

#
# mt diff -rbb3574ca77780e28d3528182eaeb7cda963c4974 -r6bcbba52935837d8cc6bbd2b56f5836157870682
#
# 
# 
# patch "conf/machine/h5000.conf"
#  from [b6fb552c41aeff2850cd35e5d3dfb99733e1e56d]
#    to [e03a562f647e39de325cf64e33abb934e96da504]
# 
# patch "packages/tasks/task-base.bb"
#  from [c13ff0dc014dd2c93926e1f1aef880d9dda3571c]
#    to [1a4f000020453dc9598a87cbb8a1df9e88bc5c96]
# 
============================================================
--- conf/machine/h5000.conf	b6fb552c41aeff2850cd35e5d3dfb99733e1e56d
+++ conf/machine/h5000.conf	e03a562f647e39de325cf64e33abb934e96da504
@@ -27,7 +27,8 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
 			      kernel-module-h5400-battery \
-			      kernel-module-snd-soc-h5000"
+			      kernel-module-snd-soc-h5000 \
+			      kernel-module-i2c-pxa"
 
 #
 # Modules autoload and other boot properties
============================================================
--- packages/tasks/task-base.bb	c13ff0dc014dd2c93926e1f1aef880d9dda3571c
+++ packages/tasks/task-base.bb	1a4f000020453dc9598a87cbb8a1df9e88bc5c96
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r58"
+PR = "r59"
 
 inherit task
 


#
# mt diff -reea0b13e3079e07cf547a5690026863e07e011bf -r6bcbba52935837d8cc6bbd2b56f5836157870682
#
# 
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch"
#  content [2dd41bf751f18da06f0d638ee68db2ba1a670f11]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
#  from [b08682b1e497d6999914f7b52000ff0293b6b2ef]
#    to [e924574025f2310b2e6051f3aeef14fd3082d730]
# 
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch	2dd41bf751f18da06f0d638ee68db2ba1a670f11
+++ packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch	2dd41bf751f18da06f0d638ee68db2ba1a670f11
@@ -0,0 +1,16 @@
+Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c
+===================================================================
+--- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c	2007-09-29 18:31:15.000000000 +0200
++++ xorg-server-1.4/hw/kdrive/linux/keyboard.c	2007-09-29 18:33:02.000000000 +0200
+@@ -743,11 +743,6 @@
+     cfsetispeed(&nTty, 9600);
+     cfsetospeed(&nTty, 9600);
+     tcsetattr(fd, TCSANOW, &nTty);
+-    /*
+-     * Flush any pending keystrokes
+-     */
+-    while ((n = read (fd, buf, sizeof (buf))) > 0)
+-	;
+     KdRegisterFd (fd, LinuxKeyboardRead, ki);
+     return Success;
+ }
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.4.bb	b08682b1e497d6999914f7b52000ff0293b6b2ef
+++ packages/xorg-xserver/xserver-kdrive_1.4.bb	e924574025f2310b2e6051f3aeef14fd3082d730
@@ -1,9 +1,9 @@ PE = "1"
 require xserver-kdrive-common.inc
 
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
 
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
@@ -20,6 +20,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
 	file://xcalibrate-new-input-world-order.patch;patch=1 \
 	file://tslib-default-device.patch;patch=1 \
 	file://fbdev-evdev.patch;patch=1 \
+	file://keyboard-resume-workaround.patch;patch=1 \
 	file://xorg-avr32-support.diff;patch=1 \
         "