diff options
author | Ross Burton <ross.burton@intel.com> | 2017-05-26 14:37:13 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-29 15:15:13 +0100 |
commit | 4292886ee3b2311902af2b5aaa5f53c5b36c6bee (patch) | |
tree | 7769aba88e36f4df961e21341825b515e1b2a089 | |
parent | 9732a2ba2edf2607e61ae4fe0d65a02b7918cfe7 (diff) | |
download | openembedded-core-contrib-4292886ee3b2311902af2b5aaa5f53c5b36c6bee.tar.gz |
gstreamer1.0-omx: delete broken m4 files
These m4 files need to be deleted so that the versions in the sysroot that we've
patched are used. Specifically, building documentation fails as the gtk-doc
checks fail.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc index 05562b11a7e..5d9235104ec 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc @@ -29,10 +29,17 @@ python __anonymous () { d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH")) } +delete_pkg_m4_file() { + # Delete m4 files which we provide patched versions of but will be ignored + # if these exist + rm -f "${S}/common/m4/pkg.m4" + rm -f "${S}/common/m4/gtk-doc.m4" +} +do_configure[prefuncs] += "delete_pkg_m4_file" + set_omx_core_name() { sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" "${D}${sysconfdir}/xdg/gstomx.conf" } - do_install[postfuncs] += " set_omx_core_name " FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" |