summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2006-11-20 08:59:10 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2006-11-20 08:59:10 +0000
commite287840babfb3ad53bc80584bf55e665102dc862 (patch)
treebf467a4dff5908b40f1f3285c98ce04949e5f498
parent679286315b28017456411ceb604e88b95e989605 (diff)
parent0ccec93933e3e19b8d2283abad92b2d5c853a8d6 (diff)
merge of '68d786d826a65a1207a0d57228f667514ce0e74b'
and '9bffa04e210205375d9a75632e31368255316a3b'
-rw-r--r--conf/local.conf.sample4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 0f098c3272..52bd88a4e9 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -42,7 +42,7 @@ BBMASK = ""
# Select between multiple alternative providers, if more than one is eligible.
PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
+PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
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"
@@ -76,7 +76,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
# distros, i.e. they explicitely select specific versions of various
# packages.
# Stay away from unversioned distros unless you really know what you are doing
-# DISTRO = "familiar-unstable"
+# DISTRO = "generic"
# So far, angstrom.conf and familiar.conf set ENABLE_BINARY_LOCALE_GENERATION
# to generate binary locale packages at build time using qemu-native and