[OE-core] [PATCH 2/6] bitbake.conf: Include the new default-providers.inc and default-versions.inc files

[Koen Kooi]

Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:

> From: Richard Purdie <richard.purdie at linuxfoundation.org>
> 
> 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.
> 
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> ---
> meta/conf/bitbake.conf                            |    3 +
> meta/conf/distro/include/default-providers.inc    |   34 ++++++++++++
> meta/conf/distro/include/default-versions.inc     |   18 ++++++
> meta/conf/distro/include/poky-fixed-revisions.inc |   27 ---------
> meta/conf/distro/poky.conf                        |   59 +--------------------
> 5 files changed, 56 insertions(+), 85 deletions(-)
> create mode 100644 meta/conf/distro/include/default-providers.inc
> create mode 100644 meta/conf/distro/include/default-versions.inc
> delete mode 100644 meta/conf/distro/include/poky-fixed-revisions.inc
> 

> diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> new file mode 100644
> index 0000000..d51ac64
> --- /dev/null
> +++ b/meta/conf/distro/include/default-providers.inc
> @@ -0,0 +1,34 @@
> 
> +PREFERRED_PROVIDER_gconf ?= "gconf-dbus"

the dbus port has long been merged upstream, so proper gconf would be a better choice. We could ignore it and just use dconf in meta-gnome, though ;)


> +PREFERRED_PROVIDER_opkg ?= "opkg"

We should sync with OE and drop the ssl/gpg stuff noone seems to be using.

> diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
> new file mode 100644
> index 0000000..0abbd8f
> --- /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}

AIUI 0.9.15 is the last version that doesn't need atomic ops. In OE we backported the necessary bits to gcc 4.3.x, gcc 4.5.x already has them. So lets drop the _arm override or atleast document why.

> +# Force the python versions in one place
> +PYTHON_BASEVERSION ?= "2.6"
> +PREFERRED_VERSION_python ?= "2.6.6"
> +PREFERRED_VERSION_python-native ?= "2.6.6"

Not really related, but update to 2.7.x?

regards,

Koen