[COMMUNITY] BSP's should not ship files in /usr/local/

 * replace /usr/local with path /usr/share/renesas using:
   RENESAS_DATADIR = "/usr"
   - meta-rcar-gen3/include/rcar-gen3-path-common.inc

Bug-AGL: SPEC-533

Change-Id: I865ea809c3c59ba136027fc8b99628df20c16275
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>

9 files changed, 11 insertions, 9 deletions

diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb
index 4195d67..ecc67b8 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb
@@ -20,7 +20,7 @@ SRCREV = "72d7d19baa093e1a4f66780d6395977b6c981725"
 
 S = "${WORKDIR}/git"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_install_append() {
     # Create destination directories
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb
index 82df7f2..857e55c 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb
@@ -20,7 +20,7 @@ SRCREV = "45779953bd9069ffc8add30d247f87326a8f89e9"
 
 S = "${WORKDIR}/git"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_install_append() {
     # Create destination directories
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb
index d76aad4..50d6d22 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb
@@ -20,7 +20,7 @@ SRCREV = "df724a9a8b4594bcbb7bd3a3bae9bea06244a7d5"
 
 S = "${WORKDIR}/git"
 
-includedir="/usr/local/include"
+includedir="${RENESAS_DATADIR}/include"
 
 do_install_append () {
     # Create destination directories
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb
index caf1fc3..691ba07 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb
@@ -14,7 +14,7 @@ MMNGR_CFG_salvator-x = "MMNGR_SALVATORX"
 MMNGR_CFG_h3ulcb = "MMNGR_SALVATORX"
 MMNGR_CFG_m3ulcb = "MMNGR_SALVATORX"
 
-includedir="/usr/local/include"
+includedir="${RENESAS_DATADIR}/include"
 SSTATE_DUPWHITELIST += "${STAGING_INCDIR}"
 
 do_compile() {
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb
index b0d0085..4f61ee6 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb
@@ -9,7 +9,7 @@ PR = "r0"
 S = "${WORKDIR}/git"
 MMNGRBUF_DRV_DIR = "mmngr_drv/mmngrbuf/mmngrbuf-module/files/mmngrbuf"
 
-includedir="/usr/local/include"
+includedir="${RENESAS_DATADIR}/include"
 SSTATE_DUPWHITELIST += "${STAGING_INCDIR}"
 
 do_compile() {
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb
index dea0abe..2210245 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb
@@ -23,7 +23,7 @@ SRC_URI = "${QOS_DRV_URL};branch=${BRANCH}"
 S = "${WORKDIR}/git"
 QOS_DRV_DIR = "qos-module/files/qos/drv"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_compile() {
     cd ${S}/${QOS_DRV_DIR}/
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb
index fa02d79..b12c1de 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = " \
     file://src/cmn/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
 "
 require include/omx-control.inc
+require include/rcar-gen3-path-common.inc
+
 inherit module
 PR = "r0"
 
@@ -23,7 +25,7 @@ EXTRA_OEMAKE += "CROSS_COMPILE=${CROSS_COMPILE}"
 
 B="${S}/src/makefile"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_compile_prepend() {
     export UVCS_SRC="${S}/src"
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb
index ccf2164..8145569 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb
@@ -22,7 +22,7 @@ SRC_URI = "${VSPM_DRV_URL};branch=${BRANCH}"
 
 S = "${WORKDIR}/git"
 VSPM_DRV_DIR = "vspm-module/files/vspm"
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_compile() {
     cd ${S}/${VSPM_DRV_DIR}/drv
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb
index 1ddd256..49be53f 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb
@@ -24,7 +24,7 @@ SRC_URI = "${VSPMIF_DRV_URL};branch=${BRANCH}"
 S = "${WORKDIR}/git"
 VSPMIF_DRV_DIR = "vspm_if-module/files/vspm_if"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_compile() {
     cd ${S}/${VSPMIF_DRV_DIR}/drv