summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-10-12 01:22:36 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-10-12 01:22:36 +0000
commit3bc3e2b4ff8e6e17351b2938fb18ae11eb069eed (patch)
treecc1f3d99429f694e68f5b07b508fcda101a02a01
parent984884dc32fdf23a7b82e04d86a8515b1c73beb7 (diff)
parente4f40e3c951e3ed7f0624a8ba1d440aba6af27e7 (diff)
merge of '3985bcd7ec541c61234ed284c4d7d7ee263a3a9f'
and 'eb9fcfc3252827f84d56edd36426fb39c72f1eed'
-rw-r--r--conf/distro/include/slugos.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 71d5fd7b3c..a111df116c 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -43,7 +43,7 @@ TARGET_FPU = "soft"
USE_NLS_glib-2.0 = "yes"
USE_NLS_glib-2.0-native = "yes"
-INHERIT += "package_ipk debian"
+INHERIT += "package_ipk debian testlab"
# FULL_OPTIMIZATION
# Optimization settings. Os works fine and is significantly better than O2.
@@ -157,6 +157,10 @@ PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
PREFERRED_VERSION_pango ?= 1.20.5
PREFERRED_VERSION_glib-2.0 ?= 2.16.1
+# Stick with an older gettext
+PREFERRED_VERSION_gettext ?= "0.14.1"
+PREFERRED_VERSION_gettext-native ?= "0.14.1"
+
# we don't ship gtk-directfb by default
PREFERRED_PROVIDER_gtk+ ?= "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+"