diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-03-31 10:41:24 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-03-31 10:41:24 +0000 |
| commit | 7c1c83b2bcd15bd5f6de67411ee314be031177c6 (patch) | |
| tree | 0b4a379255464e97f22881c2f3c9ab1c3d859009 /conf/distro | |
| parent | e76c74494e359ecc8b93cb8aec6875d990eb3980 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/31 11:44:29+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded
2005/03/31 11:43:09+02:00 utwente.nl!koen
preferred-gpe-versions.inc:
work around cairo cvs breakage
2005/03/31 10:33:58+02:00 utwente.nl!koen
preferred-gpe-versions.inc:
switch to release xext
2005/03/31 10:33:04+02:00 utwente.nl!koen
familiar-0.8.2.conf:
switch to debug release and move cvsdate forward
BKrev: 424bd3d4zOwe-3_i4eucANaA5HQqqA
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/familiar-0.8.2.conf | 6 | ||||
| -rw-r--r-- | conf/distro/preferred-gpe-versions.inc | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/conf/distro/familiar-0.8.2.conf b/conf/distro/familiar-0.8.2.conf index 2720812315..cbcdbbc9f6 100644 --- a/conf/distro/familiar-0.8.2.conf +++ b/conf/distro/familiar-0.8.2.conf @@ -4,14 +4,14 @@ DISTRO = "familiar" DISTRO_NAME = "Familiar Linux" DISTRO_VERSION = "v0.8.2" -#DISTRO_TYPE = "debug" -DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" +#DISTRO_TYPE = "release" FEED_URIS += " \ base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" -CVSDATE = 20050328 +CVSDATE = 20050331 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc index 337a0a2560..52ebdd92f9 100644 --- a/conf/distro/preferred-gpe-versions.inc +++ b/conf/distro/preferred-gpe-versions.inc @@ -5,6 +5,7 @@ #work around some breakages CVSDATE_xserver-kdrive=20050207 CVSDATE_minimo=20050316 +CVSDATE_cairo=20050330 #specify versions, as the header says :) PREFERRED_VERSION_libmatchbox ?= "1.6" @@ -26,7 +27,7 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_rxvt-unicode ?= "5.3" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.14" -PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}" +#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_xhost ?= "0.0cvs20040413" PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" |