diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-05-26 11:30:16 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-05-26 11:30:16 +0000 |
| commit | 0a6997fcdc1e742de84d19824c0447a62eea9d42 (patch) | |
| tree | 1cee79a54971abcadad88551dac3d24b51bb4c19 | |
| parent | 553b40900baf51950ee9b99a19be022b6b4d501a (diff) | |
| download | openembedded-core-0a6997fcdc1e742de84d19824c0447a62eea9d42.tar.gz openembedded-core-0a6997fcdc1e742de84d19824c0447a62eea9d42.tar.bz2 openembedded-core-0a6997fcdc1e742de84d19824c0447a62eea9d42.tar.xz openembedded-core-0a6997fcdc1e742de84d19824c0447a62eea9d42.zip | |
poky: Add some preferred provider defines and clean up the distro file a bit. Should be no behaviour changes.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@427 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | openembedded/conf/distro/poky-oabi.conf | 2 | ||||
| -rw-r--r-- | openembedded/conf/distro/poky.conf | 22 |
2 files changed, 14 insertions, 10 deletions
diff --git a/openembedded/conf/distro/poky-oabi.conf b/openembedded/conf/distro/poky-oabi.conf index fa78fe378..71d609201 100644 --- a/openembedded/conf/distro/poky-oabi.conf +++ b/openembedded/conf/distro/poky-oabi.conf @@ -8,4 +8,4 @@ PREFERRED_VERSION_gcc-cross ?= "3.4.4" PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1" PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" -PREFERRED_VERSION_glibc-intermediate ?= "2.3.5+cvs20050627" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc"
\ No newline at end of file diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf index a2e44dba9..3e634f779 100644 --- a/openembedded/conf/distro/poky.conf +++ b/openembedded/conf/distro/poky.conf @@ -42,18 +42,26 @@ include conf/distro/poky-${POKYMODE}.conf # # Preferred providers: # +# Toolchain: 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" + +# Libc/uclibc: #fix some iconv issues, needs to be adjusted when doing uclibc builds PREFERRED_PROVIDER_virtual/libiconv ?= glibc PREFERRED_PROVIDER_virtual/libintl ?= glibc + +# Virtuals: +PREFERRED_PROVIDER_virtual/db ?= "db" +PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive + +# Others: PREFERRED_PROVIDER_libx11 ?= "diet-x11" PREFERRED_PROVIDER_gconf ?= gconf-dbus PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus - -PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}" +PREFERRED_PROVIDER_tslib ?= tslib # @@ -120,18 +128,15 @@ PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}" PREFERRED_VERSION_libmatchbox ?= "1.7+svn${SRCDATE}" PREFERRED_VERSION_xserver-kdrive = "0.0+cvs${SRCDATE}" -#PREFERRED_VERSION_atk ?= "1.10.1" -#PREFERRED_VERSION_cairo ?= "1.0.0" PREFERRED_VERSION_glib-2.0 ?= "2.8.6" -#PREFERRED_VERSION_gtk+ ?= "2.8.9" -#PREFERRED_VERSION_pango ?= "1.10.0" - PREFERRED_VERSION_atk ?= "1.10.1" -#PREFERRED_VERSION_glib-2.0 ?= "2.6.4" PREFERRED_VERSION_gtk+ ?= "2.6.7" +#PREFERRED_VERSION_gtk+ ?= "2.8.16" +#PREFERRED_VERSION_cairo ?= "1.0.0" PREFERRED_VERSION_pango ?= "1.10.0" PREFERRED_VERSION_dbus ?= "0.60" +PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}" PREFERRED_VERSION_diet-x11 ?= "6.2.1" PREFERRED_VERSION_dillo2 ?= "0.6.6" @@ -160,7 +165,6 @@ PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_xproto ?= "6.6.2" PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_xst ?= "0.15" - PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}" PCMCIA_MANAGER = "pcmciautils" |