aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Behrens <holger.behrens@windriver.com>2014-11-18 14:32:49 +0100
committerHolger Behrens <holger.behrens@windriver.com>2014-11-18 16:41:01 +0100
commit5d3f446fa28a35a135f2ae15416b477a638a7cf9 (patch)
treef5a501b859ca510f04e7b7f0140c7ee0ce10e086
parent6aa836c94696c993d6b106dc1b696f1283fbf369 (diff)
downloadmeta-ivi-5d3f446fa28a35a135f2ae15416b477a638a7cf9.tar.gz
meta-ivi-5d3f446fa28a35a135f2ae15416b477a638a7cf9.tar.bz2
meta-ivi-5d3f446fa28a35a135f2ae15416b477a638a7cf9.zip
poky-ivi-systemd: revert work around for bug #6930
As YP 1.7.0 BUG 6930 has been fixed upstream, revert the local work around. (Poky rev: f3a177cf045b19612b7d2c96889ac24307191c3d) Also prefer gstreamer1.0-libav "1.4.%" and gstreamer1.0-omx "1.2.%". Signed-off-by: Holger Behrens <holger.behrens@windriver.com>
-rw-r--r--meta-ivi/conf/distro/poky-ivi-systemd.conf6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta-ivi/conf/distro/poky-ivi-systemd.conf b/meta-ivi/conf/distro/poky-ivi-systemd.conf
index 4ecd91c..a24a01c 100644
--- a/meta-ivi/conf/distro/poky-ivi-systemd.conf
+++ b/meta-ivi/conf/distro/poky-ivi-systemd.conf
@@ -25,16 +25,14 @@ PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.14%"
PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.14%"
PREFERRED_VERSION_linux-yocto_vexpressa9 ?= "3.14%"
-### later versions are GPLv3+
-# YP 1.7.0 BUG 6930
-PREFERRED_VERSION_readline ?= "5.2"
-
# prefer gstreamer 1.4.x over 1.2.3
PREFERRED_VERSION_gstreamer1.0 ?= "1.4.%"
PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.4.%"
PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.4.%"
PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.4.%"
PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.4.%"
+PREFERRED_VERSION_gstreamer1.0-libav ?= "1.4.%"
+PREFERRED_VERSION_gstreamer1.0-omx ?= "1.2.%"
POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "packagegroup-core-device-devel",d)}"
DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}"