diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-16 10:40:11 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-16 10:40:11 +0000 |
| commit | b464c8a66b8512816bdb7f5ba12bb9c2348d1fe8 (patch) | |
| tree | f8b92d65cc4f2ee6d433df95f26f0ba9c22ceb6d | |
| parent | 999598e3d0b909b13fa31197fbb844b98277cae3 (diff) | |
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
| -rw-r--r-- | conf/distro/preferred-gpe-versions.inc | 2 | ||||
| -rw-r--r-- | packages/xserver/xserver-kdrive_20050207.bb | 1 | ||||
| -rw-r--r-- | packages/xserver/xserver-kdrive_cvs.bb | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc index e6235054ee..b68eb32c2a 100644 --- 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 d1910bdd6e..591cfaf476 100644 --- 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 c3fccd636b..dfdbdc4511 100644 --- 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" |