diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-10 12:53:25 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-11 15:22:54 +0100 |
| commit | 044853350b3eff5342e23d6d4fe03e0ef0a9b66a (patch) | |
| tree | 5ab7fb6a8544c5b9a4eaaa2915dc679acc96bd07 /meta/conf | |
| parent | 16cfbd6ef1b228a4ddbd3eced988f877534ffd55 (diff) | |
| download | ast2050-yocto-poky-044853350b3eff5342e23d6d4fe03e0ef0a9b66a.zip ast2050-yocto-poky-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.conf | 3 | ||||
| -rw-r--r-- | meta/conf/distro/include/poky-fixed-revisions.inc | 27 |
2 files changed, 3 insertions, 27 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 4a1bfa1..d843e70 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -627,6 +627,9 @@ include conf/build/${BUILD_SYS}.conf include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf include conf/machine-sdk/${SDKMACHINE}.conf +include conf/distro/include/default-providers.inc +include conf/distro/include/default-versions.inc +include conf/distro/include/world-broken.inc include conf/distro/${DISTRO}.conf include conf/documentation.conf require 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 9486080..0000000 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ /dev/null @@ -1,27 +0,0 @@ -# Preferred Versions: -# -PREFERRED_VERSION_libmatchbox ?= "1.9" -PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" -PREFERRED_VERSION_elfutils ?= "0.89" -PREFERRED_VERSION_hal ?= "0.5.14" -PREFERRED_VERSION_hal-info ?= "20091130" -PREFERRED_VERSION_udev ?= "164" -PREFERRED_VERSION_wpa-supplicant ?= "0.7.3" -PREFERRED_VERSION_pseudo = "1.0" -PREFERRED_VERSION_pseudo-native = "1.0" - -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" - - - - |
