conf: Sync with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@892 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 7 insertions, 6 deletions

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index bbf8d940ad..82edf8d8fa 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -13,10 +13,11 @@ PACKAGE_CLASSES ?= "package_ipk"
 INHERIT += " ${PACKAGE_CLASSES} debian multimachine poky devshell "
 # For some reason, this doesn't work
 # TARGET_OS ?= "linux"
+# TARGET_VENDOR = "-poky"
 TARGET_OS = "linux"
 TARGET_FPU_arm ?= "soft"
 TARGET_FPU_armeb ?= "soft"
-IMAGE_ROOTFS_SIZE_ext2 ?= 131072
+IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
 
 PARALLEL_INSTALL_MODULES = "1"
 
@@ -50,8 +51,8 @@ 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
+PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
+PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
 
 # Virtuals:
 PREFERRED_PROVIDER_virtual/db ?= "db"
@@ -62,9 +63,9 @@ PREFERRED_PROVIDER_virtual/update-alternatives-native ?= update-alternatives-cwo
 
 # Others:
 PREFERRED_PROVIDER_libx11 ?= "diet-x11"
-PREFERRED_PROVIDER_gconf ?= gconf-dbus
-PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus
-PREFERRED_PROVIDER_tslib ?= tslib
+PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
+PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs-dbus"
+PREFERRED_PROVIDER_tslib ?= "tslib"
 
 
 #