Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/16 12:30:58+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/06/16 12:30:42+02:00 utwente.nl!koen
preferred-gpe-versions.inc:  use other xextensions
xserver-kdrive_cvs.bb, xserver-kdrive_20050207.bb:  change some default_prefs
Net result: 'old' kdrive, but tslib works again.

BKrev: 42b1570bcSf7XUbnpmGS5P-Z0fhVvw

diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index e623505..b68eb32 100644 (file)
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -30,7 +30,7 @@ PREFERRED_VERSION_xproto ?= "6.6.2"
 PREFERRED_VERSION_rxvt-unicode ?= "5.3"
 #PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
 #PREFERRED_VERSION_xst ?= "0.14"
-PREFERRED_VERSION_xextensions ?= "0.0cvs20050610"
+PREFERRED_VERSION_xextensions ?= "1.0.1"
 PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
 PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
 PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"

diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index d1910bd..591cfaf 100644 (file)
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -1,5 +1,6 @@
 PV = "0.0cvs${FIXEDCVSDATE}"
 FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+DEFAULT_PREFERENCE = "1"
 
 LICENSE = "MIT"
 DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"

diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb
index c3fccd6..dfdbdc4 100644 (file)
--- a/packages/xserver/xserver-kdrive_cvs.bb
+++ b/packages/xserver/xserver-kdrive_cvs.bb
@@ -1,4 +1,6 @@
 PV = "0.0cvs${CVSDATE}"
+DEFAULT_PREFERENCE = "-2"
+
 LICENSE = "MIT"
 DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
 PROVIDES = "virtual/xserver"