diff options
| author | Kristoffer Ericson <kristoffer_e1@hotmail.com> | 2006-07-31 15:36:05 +0000 |
|---|---|---|
| committer | Kristoffer Ericson <kristoffer_e1@hotmail.com> | 2006-07-31 15:36:05 +0000 |
| commit | cc67256da139ba348bfc5e98138da3d7e84c7f48 (patch) | |
| tree | a88692987440c7a78c27dfc5ff1aa3cf01223da1 /conf/distro | |
| parent | 5e5b590002af02b51b7e39ddb3a18357ce1954c6 (diff) | |
| parent | 09436056f94e7103d436177bdaea7c3bd9493913 (diff) | |
merge of 158d7fcc3d3ef86d360c775f912e5e314992018d
and bbd3a2811e13a3b99224c1a846af2a244d292c41
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 6 | ||||
| -rw-r--r-- | conf/distro/openzaurus-unstable.conf | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index fbb2814453..a387a102bb 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -22,7 +22,7 @@ FEED_URIS += " \ perl##${ANGSTROM_URI}/unstable/feed/perl \ python##${ANGSTROM_URI}/unstable/feed/python \ debug##${ANGSTROM_URI}/unstable/feed/debug \ - ${MACHINE}##${ANGSTROM_URI}/usntable/feed/machine/${MACHINE}" + ${MACHINE}##${ANGSTROM_URI}/unstable/feed/machine/${MACHINE}" # base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ # ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" @@ -74,7 +74,7 @@ PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive # Others: -PREFERRED_PROVIDER_x11 ?= "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" PREFERRED_PROVIDER_gconf ?= gconf-dbus PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus PREFERRED_PROVIDER_tslib ?= tslib @@ -107,7 +107,7 @@ PREFERRED_VERSION_busybox = "1.2.0" PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" -PREFERRED_VERSION_dbus ?= "0.61" +PREFERRED_VERSION_dbus ?= "0.62" PREFERRED_VERSION_gstreamer ?= "0.10.6" PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 14372b5b9e..e8eef43b70 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -10,6 +10,8 @@ CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ http://www.oesources.org/source/current/" + +require conf/distro/include/sane-srcdates.inc require conf/distro/include/openzaurus.inc DISTRO_TYPE = "debug" @@ -50,8 +52,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_VERSION_binutils-cross = "2.16" -PREFERRED_VERSION_binutils = "2.16" +PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" +PREFERRED_VERSION_binutils = "2.15.94.0.1" # # Opie |