diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-07-21 09:38:10 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-22 11:51:03 +0100 |
| commit | c9610a3e43c48712f08aca3040f97b42ffd28f96 (patch) | |
| tree | f7899b4d0f7a86b765192376be9e55ca89b9057b /meta/conf | |
| parent | a7d38bca9c28a737a0ad0ac1d7a39e246f495327 (diff) | |
| download | poky-c9610a3e43c48712f08aca3040f97b42ffd28f96.tar.gz | |
default-versions: Update pulseaudio as arm no longer needs a seperate backport
(From OE-Core rev: 92e97ab066f58f38d3cc74c984ad4c7abc7d51b1)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/distro/include/default-versions.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc index 377aba5860..e3ef1e6661 100644 --- a/meta/conf/distro/include/default-versions.inc +++ b/meta/conf/distro/include/default-versions.inc | |||
| @@ -1,9 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Default preferred versions | 2 | # Default preferred versions |
| 3 | # | 3 | # |
| 4 | PULSEAUDIOVERSION ?= "0.9.22" | 4 | PREFERRED_VERSION_pulseaudio ?= "0.9.23" |
| 5 | PULSEAUDIOVERSION_arm ?= "0.9.15" | ||
| 6 | PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}" | ||
| 7 | 5 | ||
| 8 | # Force the python versions in one place | 6 | # Force the python versions in one place |
| 9 | PYTHON_BASEVERSION ?= "2.6" | 7 | PYTHON_BASEVERSION ?= "2.6" |