summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorKristoffer Ericson <kristoffer_e1@hotmail.com>2006-09-03 22:43:59 +0000
committerKristoffer Ericson <kristoffer_e1@hotmail.com>2006-09-03 22:43:59 +0000
commit88ddfa8fba208fc9c874480f9a8889bd65225e43 (patch)
tree7edd04d71988853de4c8dbe4941f2596847eb588 /conf/distro
parent806294f16a8f9ee061cfd99adeb2087f3538c998 (diff)
conf/distro/jlime-donkey.conf : GTK related versions remove, bugfix
* Removed all GTK, GLIB related stuff so we start bugtrack why osb-jscore doeesnt build. * Added PREFERRED_PROVIDER for glibc-intermediate so it grabs 2.4. Had to set specific defines for both archs due to some bitbake bug when using {ARCH} in define line.
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/jlime-donkey.conf31
1 files changed, 7 insertions, 24 deletions
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index e668c3ce38..76e68fcc08 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -53,19 +53,13 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"
PREFERRED_VERSION_glibc = "2.4"
PREFERRED_VERSION_glibc-intermediate = "2.4"
-
-#<>------------------------------------------------------------------>
-#<>Setting Preferred glib, dbus, db-native
-#<>------------------------------------------------------------------<
-PREFERRED_VERSION_glib-2.0-native = "2.6.5"
-PREFERRED_VERSION_glib-1.2-native = "1.2.10"
-PREFERRED_VERSION_glib-2.0 = "2.12.0"
-PREFERRED_VERSION_glib-1.2 = "1.2.10"
-PREFERRED_VERSION_pango = "1.12.0"
-PREFERRED_VERSION_dbus = "0.61"
-PREFERRED_VERSION_dbus-native = "0.61"
-PREFERRED_PROVIDER_dbus-glib = "dbus"
-PREFERRED_PROVIDER_virtual/db-native = "db-native"
+#<>----------------------------------------------------------------->
+#<>Patch for bitbake bug:
+#<>Due to bitbake not grabbing glibc 2.4 properly
+#<>we need to override it to be sure. Do it for both supported archs
+#<>-----------------------------------------------------------------<
+PREFERRED_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
#<>------------------------------------------------------------------>
@@ -110,17 +104,6 @@ require conf/distro/include/preferred-opie-versions.inc
#<>------------------------------------------------------------------>
-#<> Lets decide on a GPE versipns
-#<> And lets override GTK to something that builds
-#<>------------------------------------------------------------------<
-require conf/distro/include/preferred-gpe-versions-2.7.inc
-PREFERRED_VERSION_gtk+ = "2.8.16"
-PREFERRED_VERSION_pango = "1.12.0"
-PREFERRED_VERSION_cairo = "1.2.2"
-PREFERRED_VERSION_gtk-engines = "2.7.4"
-
-
-#<>------------------------------------------------------------------>
#<> We want pcmciautils, not pcmcia-cs
#<>------------------------------------------------------------------<
PCMCIA_MANAGER = "pcmciautils"