summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Christ <s.christ@phytec.de>2016-04-07 07:18:01 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2016-04-07 14:14:25 (GMT)
commit4d65cd2cf8a05e2855321f439a3429e799ecfa0a (patch)
treec366b5beefd9381bca403dd7225aca56fb17ace9
parentdfd16c888cd3c4887252791dd484ac4475c4e32d (diff)
downloadmeta-phytec-4d65cd2cf8a05e2855321f439a3429e799ecfa0a.zip
meta-phytec-4d65cd2cf8a05e2855321f439a3429e799ecfa0a.tar.bz2
machine: remove fido workaround for core-image-sato
The workaround is not needed anymore. Gstreamer doesn't pull mesa into the image anymore. Signed-off-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--conf/machine/include/phyam335x.inc6
-rw-r--r--conf/machine/include/phyimx6.inc6
2 files changed, 0 insertions, 12 deletions
diff --git a/conf/machine/include/phyam335x.inc b/conf/machine/include/phyam335x.inc
index 6255139..3d36ab9 100644
--- a/conf/machine/include/phyam335x.inc
+++ b/conf/machine/include/phyam335x.inc
@@ -64,9 +64,3 @@ GUI_MACHINE_CLASS = "smallscreen"
PREFERRED_PROVIDER_virtual/libgles1 = "libgles-omap3"
PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
-
-# Avoid pulling package 'gstreamer1.0-plugins-bad-meta' into the image
-# 'core-image-sato', because the recipe gstreamer1.0-plugins-bad depends on
-# virtual/libgles2 which pulls in libgles-omap3 which conflicts with mesa which
-# is pulled in by xorg-xserver. Puh!
-RRECOMMENDS_gst-player-bin_remove_pn-gst-player = "gstreamer1.0-plugins-bad-meta"
diff --git a/conf/machine/include/phyimx6.inc b/conf/machine/include/phyimx6.inc
index c94bf5b..f694fc6 100644
--- a/conf/machine/include/phyimx6.inc
+++ b/conf/machine/include/phyimx6.inc
@@ -22,12 +22,6 @@ RDEPENDS_kernel-base = ""
# dont create legacy tarball of modules
MODULE_TARBALL_DEPLOY = "0"
-# Avoid pulling package 'gstreamer1.0-plugins-bad-meta' into the image
-# 'core-image-sato', because the recipe gstreamer1.0-plugins-bad depends on
-# virtual/libgles2 which pulls in imx-gpu-viv which conflicts with mesa which
-# is pulled in by xorg-xserver. Puh!
-RRECOMMENDS_gst-player-bin_remove_pn-gst-player = "gstreamer1.0-plugins-bad-meta"
-
# Use the expected value of the ubifs filesystem's volume name in the kernel
UBI_VOLNAME = "root"
# The biggest NANDs on current modules are 1GB. With current partition layout,