[oe-commits] org.oe.dev merge of '191ca636de06e217af2963e58c2f318a37663eed'

[pfalcon commit]

merge of '191ca636de06e217af2963e58c2f318a37663eed'
     and '8c52f70c6adf401e80f72d4e0d13ae32cd52d726'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: c2df40f19e8788bf21437d463d250244cd5c8d4b
ViewMTN: http://monotone.openembedded.org/revision/info/c2df40f19e8788bf21437d463d250244cd5c8d4b
Files:
1
packages/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch
packages/linux/linux-handhelds-2.6_2.6.21-hh15.bb
packages/xorg-xserver/xserver-kdrive-common.inc
Diffs:

#
# mt diff -r191ca636de06e217af2963e58c2f318a37663eed -rc2df40f19e8788bf21437d463d250244cd5c8d4b
#
# 
# 
# delete "packages/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch"
# 


#
# mt diff -r8c52f70c6adf401e80f72d4e0d13ae32cd52d726 -rc2df40f19e8788bf21437d463d250244cd5c8d4b
#
# 
# 
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh15.bb"
#  content [252b9c26ddd2fda4271f4352999ce0facbfece99]
# 
# patch "packages/xorg-xserver/xserver-kdrive-common.inc"
#  from [69820edb24da782a8f84fb3676ee676aa0293a7a]
#    to [701a8d99a136183c1057c39066992f41228dd86c]
# 
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh15.bb	252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh15.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
============================================================
--- packages/xorg-xserver/xserver-kdrive-common.inc	69820edb24da782a8f84fb3676ee676aa0293a7a
+++ packages/xorg-xserver/xserver-kdrive-common.inc	701a8d99a136183c1057c39066992f41228dd86c
@@ -116,7 +116,7 @@ EXTRA_OECONF = "--enable-composite --ena
                 --disable-xorg --disable-xorgcfg \
                 --disable-xkb --disable-xnest --disable-xvfb \
                 --disable-xevie --disable-xprint --disable-xtrap \
-                --disable-dmx \
+                --disable-dmx ${W100_OECONF} \
                 --with-default-font-path=built-ins \
                 --enable-tslib --enable-xcalibrate \
                 ac_cv_file__usr_share_X11_sgml_defs_ent=no"