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

[todd commit]

merge of 'cc027f49ffae178b1768016e339dd45753bb44c3'
     and 'f7f1a87db91fd74a3e661901b014f70b0719706e'

Author: todd at sdgsystems.com
Branch: org.openembedded.dev
Revision: 8d9f1c0adaea2946d1c6e57e528158c450e0a626
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8d9f1c0adaea2946d1c6e57e528158c450e0a626
Files:
1
packages/linux/linux-handhelds-2.6_2.6.21-hh7.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb
conf/machine/hx4700.conf
Diffs:

#
# mt diff -rcc027f49ffae178b1768016e339dd45753bb44c3 -r8d9f1c0adaea2946d1c6e57e528158c450e0a626
#
# 
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh7.bb"
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb"
# 
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb"
#  content [252b9c26ddd2fda4271f4352999ce0facbfece99]
# 
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb	252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb	252b9c26ddd2fda4271f4352999ce0facbfece99
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc


#
# mt diff -rf7f1a87db91fd74a3e661901b014f70b0719706e -r8d9f1c0adaea2946d1c6e57e528158c450e0a626
#
# 
# 
# 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"