summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-30 14:53:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 07:40:36 +0100
commit560e778589afbc5da9a20bd0fbba09b910207604 (patch)
treefbb8878c291ed22c19620a9bc92c4e612236c27a
parent59800189690f887e6f3e8c3139fa6a404b76ac71 (diff)
downloadopenembedded-core-contrib-560e778589afbc5da9a20bd0fbba09b910207604.tar.gz
gstreamer-omx: Improve variable expansion of ${S}
The way ${S} is expanded into CFLAGS means the recipe is marked as depending on the path within which its built. We can avoid this by avoiding the expansion which then allows reuse of the recipe from sstate. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
index d698904349..26c13361fe 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
@@ -20,11 +20,10 @@ EXTRA_OECONF += "--disable-valgrind --with-omx-target=${GSTREAMER_1_0_OMX_TARGET
python __anonymous () {
omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET", True)
if omx_target in ['generic', 'bellagio']:
- srcdir = d.getVar("S", True)
# Bellagio headers are incomplete (they are missing the OMX_VERSION_MAJOR,#
# OMX_VERSION_MINOR, OMX_VERSION_REVISION, and OMX_VERSION_STEP macros);
# appending a directory path to gst-omx' internal OpenMAX IL headers fixes this
- d.appendVar("CFLAGS", " -I%s/omx/openmax" % srcdir)
+ d.appendVar("CFLAGS", " -I${S}/omx/openmax")
elif omx_target == "rpi":
# Dedicated Raspberry Pi OpenMAX IL support makes this package machine specific
d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH", True))