summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-10 12:53:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-11 15:22:54 +0100
commit044853350b3eff5342e23d6d4fe03e0ef0a9b66a (patch)
tree5ab7fb6a8544c5b9a4eaaa2915dc679acc96bd07 /meta/conf
parent16cfbd6ef1b228a4ddbd3eced988f877534ffd55 (diff)
downloadpoky-044853350b3eff5342e23d6d4fe03e0ef0a9b66a.tar.gz
bitbake.conf: Include the new default-providers.inc and default-versions.inc files
These are the minimal defaults to allow OE-Core to function standalone with no distro set and are constucted such that the distro can either override values, or totally replace the include file entirely as needed. (From OE-Core rev: b34d5e93fab4274e1a56f446e2ba4756d614cc47) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc27
2 files changed, 3 insertions, 27 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4a1bfa168b..d843e705fd 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -627,6 +627,9 @@ include conf/build/${BUILD_SYS}.conf
627include conf/target/${TARGET_SYS}.conf 627include conf/target/${TARGET_SYS}.conf
628include conf/machine/${MACHINE}.conf 628include conf/machine/${MACHINE}.conf
629include conf/machine-sdk/${SDKMACHINE}.conf 629include conf/machine-sdk/${SDKMACHINE}.conf
630include conf/distro/include/default-providers.inc
631include conf/distro/include/default-versions.inc
632include conf/distro/include/world-broken.inc
630include conf/distro/${DISTRO}.conf 633include conf/distro/${DISTRO}.conf
631include conf/documentation.conf 634include conf/documentation.conf
632require conf/sanity.conf 635require conf/sanity.conf
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
deleted file mode 100644
index 948608001e..0000000000
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ /dev/null
@@ -1,27 +0,0 @@
1# Preferred Versions:
2#
3PREFERRED_VERSION_libmatchbox ?= "1.9"
4PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
5PREFERRED_VERSION_elfutils ?= "0.89"
6PREFERRED_VERSION_hal ?= "0.5.14"
7PREFERRED_VERSION_hal-info ?= "20091130"
8PREFERRED_VERSION_udev ?= "164"
9PREFERRED_VERSION_wpa-supplicant ?= "0.7.3"
10PREFERRED_VERSION_pseudo = "1.0"
11PREFERRED_VERSION_pseudo-native = "1.0"
12
13PULSEAUDIOVERSION ?= "0.9.22"
14PULSEAUDIOVERSION_arm ?= "0.9.15"
15PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}"
16
17# Force the python versions in one place
18PYTHON_BASEVERSION ?= "2.6"
19PREFERRED_VERSION_python ?= "2.6.6"
20PREFERRED_VERSION_python-native ?= "2.6.6"
21
22# Force the older version of liberation-fonts until we fix the fontforge issue
23PREFERRED_VERSION_liberation-fonts ?= "1.04"
24
25
26
27