summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2008-10-13 16:56:12 +0000
committerMike Westerhof <mwester@dls.net>2008-10-13 16:56:12 +0000
commit329b22afb18495396bf06bd96cf8a5ffcaf955f4 (patch)
tree7d0aad9efe15c4b8bae67ebc33bd6c2cb37e1d12 /conf/distro
parentf55f3d0724bdd62c22cb5cdbaa317dcfe7edc085 (diff)
SlugOS: Set PREFERRED_VERSION for gettext, e2fsprogs, and add a temporary
hack to e2fsprogs_1.38.bb to work around the autotools and gettext version incompatabilities.
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/include/slugos.inc11
1 files changed, 7 insertions, 4 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 45e8e9171b..3f92a91a3d 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 testlab"
+INHERIT += "package_ipk debian testlab packaged-staging"
# FULL_OPTIMIZATION
# Optimization settings. Os works fine and is significantly better than O2.
@@ -157,9 +157,12 @@ 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"
+# Stick with an older gettext and e2fsprogs stuff
+PREFERRED_VERSION_gettext ?= "0.14.1"
+PREFERRED_VERSION_gettext-native ?= "0.14.1"
+PREFERRED_VERSION_e2fsprogs-libs ?= "1.39"
+PREFERRED_VERSION_e2fsprogs ?= "1.38"
+PREFERRED_VERSION_e2fsprogs-native ?= "1.38"
# we don't ship gtk-directfb by default
PREFERRED_PROVIDER_gtk+ ?= "gtk+"