[oe-commits] org.oe.dev merge of '67dbe8b946b7e61ce8c584272ff315f0a7b698d2'

[todd commit]

merge of '67dbe8b946b7e61ce8c584272ff315f0a7b698d2'
     and '7d9e3c0371703df6cb39dcdb41d1d9131946eb1e'

Author: todd at sdgsystems.com
Branch: org.openembedded.dev
Revision: cc027f49ffae178b1768016e339dd45753bb44c3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cc027f49ffae178b1768016e339dd45753bb44c3
Files:
1
conf/machine/hx4700.conf
packages/linux/compulab-pxa270_2.6.16.bb
Diffs:

#
# mt diff -r67dbe8b946b7e61ce8c584272ff315f0a7b698d2 -rcc027f49ffae178b1768016e339dd45753bb44c3
#
# 
# 
# patch "conf/machine/hx4700.conf"
#  from [a98297fd1c958ca100de38bd071c622423c22d11]
#    to [7fc3dbf7c795d1c23929a02c6fb2d560d8674018]
# 
============================================================
--- conf/machine/hx4700.conf	a98297fd1c958ca100de38bd071c622423c22d11
+++ conf/machine/hx4700.conf	7fc3dbf7c795d1c23929a02c6fb2d560d8674018
@@ -27,7 +27,9 @@ MODUTILS = "26"	
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PCMCIA_MANAGER = "pcmciautils"
 MODUTILS = "26"	
+
 XSERVER = "xserver-kdrive-w100"
+PREFERRED_VERSION_xserver-kdrive = "1.2.0"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 


#
# mt diff -r7d9e3c0371703df6cb39dcdb41d1d9131946eb1e -rcc027f49ffae178b1768016e339dd45753bb44c3
#
# 
# 
# patch "packages/linux/compulab-pxa270_2.6.16.bb"
#  from [c792b7e8d3021c9d56ee96df4f48cb823b7941e4]
#    to [aa641b64bcb45bd089254790a8c5e4761f3d34cd]
# 
============================================================
--- packages/linux/compulab-pxa270_2.6.16.bb	c792b7e8d3021c9d56ee96df4f48cb823b7941e4
+++ packages/linux/compulab-pxa270_2.6.16.bb	aa641b64bcb45bd089254790a8c5e4761f3d34cd
@@ -66,8 +66,8 @@ do_deploy[dirs] = "${S}"
 
 do_deploy[dirs] = "${S}"
 
-addtask deploy before do_build after do_compile
-addtask compulab_image before do_build after do_deploy
+addtask deploy before do_install after do_compile
+addtask compulab_image before do_install after do_deploy
 
 COMPATIBLE_MACHINE = "compulab-pxa270"