From 5698cf23837e1730f21766bf1b34227b61d20133 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Fri, 8 Sep 2017 23:22:34 +0200
Subject: Fix RSS-related issues for rcar gen2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For pyro we need to fix a few recipes to work with the
recipe specific sysroot feature.

Change-Id: I9cc12083675ea2522a1f453f603b034e911d79fd
Bug-AGL: SPEC-646
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb   | 4 ++--
 meta-rcar-gen2/recipes-multimedia/vspm-module/vspm-user-module.bb | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'meta-rcar-gen2/recipes-multimedia')

diff --git a/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb b/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb
index 635b8b7..f177695 100644
--- a/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb
+++ b/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb
@@ -99,8 +99,8 @@ do_configure() {
     cd ${S}/UDF_Linux
     ./autogen.sh
     ./configure --prefix=${D}${RENESAS_DATADIR}/ --host=arm-linux \
-        CFLAGS="-I${BUILDDIR}/include -I${KERNELDIR}/include" \
-        LDFLAGS="-L${LIBSHARED}" \
+        CFLAGS="-I${BUILDDIR}/include -I${KERNELDIR}/include -I${RECIPE_SYSROOT}/usr/share/renesas/include/" \
+        LDFLAGS="-L${LIBSHARED} -L${RECIPE_SYSROOT}/usr/share/renesas/lib/" \
         OMXR_DEFAULT_CONFIG_FILE_NAME=${RENESAS_DATADIR}/config/omxr_config_base.txt
 }
 
diff --git a/meta-rcar-gen2/recipes-multimedia/vspm-module/vspm-user-module.bb b/meta-rcar-gen2/recipes-multimedia/vspm-module/vspm-user-module.bb
index 079a0d9..2c93cae 100644
--- a/meta-rcar-gen2/recipes-multimedia/vspm-module/vspm-user-module.bb
+++ b/meta-rcar-gen2/recipes-multimedia/vspm-module/vspm-user-module.bb
@@ -8,6 +8,9 @@ SRC_URI = "file://vspm-user.tar.bz2"
 
 S = "${WORKDIR}"
 
+# workaround for vspm-kernel-module header
+CC += " -I${RECIPE_SYSROOT}/usr/src/kernel/include "
+
 do_compile() {
     # Build shared library
     cd ${S}/vspm/if
-- 
cgit 1.2.3-korg