diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-03-02 17:43:42 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-02 17:43:42 +0000 |
| commit | 966f3a94af2c83ffd2c634171fbe04917731b6f9 (patch) | |
| tree | 1f3c567f32229a1a50bb00bc57abed97674bbc53 | |
| parent | 3b329bd57865df84d231b645e1e40572196bd211 (diff) | |
| parent | 3326b01658a2c98c72e455e53167ba7f252c3209 (diff) | |
explicit_merge of '09145be36a071f7c39a4d421da54e87a449cecc1'
and 'bad62b438dd2c5c176aff6068068f022faa98dbb'
using ancestor ''
to branch 'org.openembedded.dev'
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 338e0ff17e..4bb27afa51 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -10,9 +10,9 @@ DISTRO_TYPE = "debug" FEED_URIS += " \ - base##http:///${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ - ${MACHINE}##http://${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ - updates##http://${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" + base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ + ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ + updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" #CVSDATE = 20050331 @@ -32,7 +32,7 @@ PREFERRED_VERSION_qte = "2.3.10" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" +#PREFERRED_PROVIDER_libx11 = "diet-x11" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" |