From bc367526f85ec11f82826fa5ce6607b9e73f9273 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 11 May 2011 23:47:06 +0100 Subject: Add files missing from previous change Signed-off-by: Richard Purdie --- meta/conf/distro/include/default-providers.inc | 34 ++++++++++++++++++++++++++ meta/conf/distro/include/default-versions.inc | 18 ++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 meta/conf/distro/include/default-providers.inc create mode 100644 meta/conf/distro/include/default-versions.inc (limited to 'meta') diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc new file mode 100644 index 0000000000..d51ac64ef4 --- /dev/null +++ b/meta/conf/distro/include/default-providers.inc @@ -0,0 +1,34 @@ +# +# Default virtual providers +# +PREFERRED_PROVIDER_virtual/db ?= "db" +PREFERRED_PROVIDER_virtual/db-native ?= "db-native" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" +PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" +PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" + +# +# Default virtual runtime providers +# +VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" + +# +# Default recipe providers +# +PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" +PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" +PREFERRED_PROVIDER_gconf ?= "gconf-dbus" +PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf" +PREFERRED_PROVIDER_libgcc ?= "libgcc" +PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk" +PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" +PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-libc-headers-nativesdk" +PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" +PREFERRED_PROVIDER_opkg ?= "opkg" +PREFERRED_PROVIDER_opkg-native ?= "opkg-native" +PREFERRED_PROVIDER_opkg-nativesdk ?= "opkg-nativesdk" + diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc new file mode 100644 index 0000000000..0abbd8f87d --- /dev/null +++ b/meta/conf/distro/include/default-versions.inc @@ -0,0 +1,18 @@ +# +# Default preferred versions +# +PULSEAUDIOVERSION ?= "0.9.22" +PULSEAUDIOVERSION_arm ?= "0.9.15" +PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}" + +# Force the python versions in one place +PYTHON_BASEVERSION ?= "2.6" +PREFERRED_VERSION_python ?= "2.6.6" +PREFERRED_VERSION_python-native ?= "2.6.6" + +# Force the older version of liberation-fonts until we fix the fontforge issue +PREFERRED_VERSION_liberation-fonts ?= "1.04" + + + + -- cgit v1.2.3-54-g00ecf