[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>

8 files changed, 34 insertions, 29 deletions

diff --git a/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb
index 5951a4c..36253d8 100644
--- a/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb
+++ b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-demoapps.bb
@@ -14,7 +14,7 @@ DEPENDS = "kernel-module-avb-streaming libyaml"
 
 S = "${WORKDIR}/git/avb-demoapps"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 # submodule is extracted before do_populate_lic
 addtask do_init_submodule after do_unpack before do_patch
diff --git a/meta-rcar-gen3/recipes-multimedia/dtv-module/dtv-user-module.bb b/meta-rcar-gen3/recipes-multimedia/dtv-module/dtv-user-module.bb
index 76d96f8..55efa92 100644
--- a/meta-rcar-gen3/recipes-multimedia/dtv-module/dtv-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/dtv-module/dtv-user-module.bb
@@ -39,18 +39,18 @@ do_compile[noexec] = "1"
 do_install() {
     # Create destination folders
     install -d ${D}/${libdir}
-    install -d ${D}/usr/local/include
-    install -d ${D}/usr/local/src/dtv/reference
+    install -d ${D}${RENESAS_DATADIR}/include
+    install -d ${D}${RENESAS_DATADIR}/src/dtv/reference
 
     # Copy library
     install -m 644 ${S}/${baselib}/*.a ${D}/${libdir}/
 
     # Copy shared header files
-    install -m 644 ${S}/include/*.h ${D}/usr/local/include
+    install -m 644 ${S}/include/*.h ${D}${RENESAS_DATADIR}/include
 
     # Copy reference files
-    install -m 644 ${S}/userfunc/*.h ${D}/usr/local/src/dtv/reference
-    install -m 644 ${S}/userfunc/*.c ${D}/usr/local/src/dtv/reference
+    install -m 644 ${S}/userfunc/*.h ${D}${RENESAS_DATADIR}/src/dtv/reference
+    install -m 644 ${S}/userfunc/*.c ${D}${RENESAS_DATADIR}/src/dtv/reference
 }
 
 PACKAGES = " \
@@ -63,8 +63,8 @@ FILES_${PN} = ""
 ALLOW_EMPTY_${PN} = "1"
 
 FILES_${PN}-dev = " \
-    /usr/local/include/*.h \
-    /usr/local/src/dtv/reference/* \
+    ${RENESAS_DATADIR}/include/*.h \
+    ${RENESAS_DATADIR}/src/dtv/reference/* \
 "
 FILES_${PN}-staticdev = " \
     ${libdir}/*.a \
diff --git a/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-user-module.bb b/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-user-module.bb
index ff3633b..aead035 100644
--- a/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-user-module.bb
@@ -35,13 +35,13 @@ do_compile[noexec] = "1"
 do_install() {
     # Create destination folders
     install -d ${D}/${libdir}
-    install -d ${D}/usr/local/include
+    install -d ${D}${RENESAS_DATADIR}/include
 
     # Copy library
     install -m 644 ${S}/${baselib}/*.a ${D}/${libdir}
 
     # Copy shared header files
-    install -m 644 ${S}/include/*.h ${D}/usr/local/include
+    install -m 644 ${S}/include/*.h ${D}${RENESAS_DATADIR}/include
 }
 
 PACKAGES = " \
@@ -54,7 +54,7 @@ FILES_${PN} = ""
 ALLOW_EMPTY_${PN} = "1"
 
 FILES_${PN}-dev = " \
-    /usr/local/include/*.h \
+    ${RENESAS_DATADIR}/include/*.h \
 "
 FILES_${PN}-staticdev = " \
     ${libdir}/*.a \
diff --git a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr-user-module.bb b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr-user-module.bb
index b22490e..ac4cf30 100644
--- a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr-user-module.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "Memory Manager User module for Renesas R-Car Gen3"
 require mmngr_lib.inc
+require include/rcar-gen3-path-common.inc
 
 DEPENDS = "kernel-module-mmngr"
 PN = "mmngr-user-module"
@@ -11,13 +12,14 @@ EXTRA_OECONF =  "${@bb.utils.contains("DISTRO_FEATURES", "mm-test", \
     " --enable-mmngr-test", "", d)}"
 
 exec_prefix = "/usr"
-bindir = "/usr/local/bin"
-includedir = "/usr/local/include"
+bindir = "${RENESAS_DATADIR}/bin"
+includedir = "${RENESAS_DATADIR}/include"
+CFLAGS += " -I${STAGING_DIR_HOST}${RENESAS_DATADIR}/include"
 
 do_install_append() {
-    if [ -f ${D}/usr/local/bin/mmtp ]; then
+    if [ -f ${D}${RENESAS_DATADIR}/bin/mmtp ]; then
         if [ X${WS} = "X32" ]; then
-            mv ${D}/usr/local/bin/mmtp ${D}/usr/local/bin/mmtp${WS}
+            mv ${D}${RENESAS_DATADIR}/bin/mmtp ${D}${RENESAS_DATADIR}/bin/mmtp${WS}
         fi
     fi
 }
diff --git a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb
index 916d567..690169f 100644
--- a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "Memory Manager Buffer User module for Renesas R-Car Gen3"
 require mmngr_lib.inc
+require include/rcar-gen3-path-common.inc
 
 DEPENDS = "kernel-module-mmngrbuf"
 PN = "mmngrbuf-user-module"
@@ -11,13 +12,14 @@ EXTRA_OECONF =  "${@bb.utils.contains("DISTRO_FEATURES", "mm-test", \
     " --enable-mmngrbuf-test", "", d)}"
 
 exec_prefix = "/usr"
-bindir = "/usr/local/bin"
-includedir = "/usr/local/include"
+bindir = "${RENESAS_DATADIR}/bin"
+includedir = "${RENESAS_DATADIR}/include"
+CFLAGS += " -I${STAGING_DIR_HOST}${RENESAS_DATADIR}/include"
 
 do_install_append() {
-    if [ -f ${D}/usr/local/bin/mmbuftp ]; then
+    if [ -f ${D}${RENESAS_DATADIR}/bin/mmbuftp ]; then
         if [ X${WS} = "X32" ]; then
-            mv ${D}/usr/local/bin/mmbuftp ${D}/usr/local/bin/mmbuftp${WS}
+            mv ${D}${RENESAS_DATADIR}/bin/mmbuftp ${D}${RENESAS_DATADIR}/bin/mmbuftp${WS}
         fi
     fi
 }
diff --git a/meta-rcar-gen3/recipes-multimedia/omx-module/omx-user-module.bb b/meta-rcar-gen3/recipes-multimedia/omx-module/omx-user-module.bb
index 87a5937..08ea7b1 100644
--- a/meta-rcar-gen3/recipes-multimedia/omx-module/omx-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/omx-module/omx-user-module.bb
@@ -18,7 +18,8 @@ DEPENDS += '${@base_conditional("USE_VIDEO_OMX", "1", "kernel-module-uvcs-drv",
 
 inherit autotools
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
+CFLAGS += " -I${STAGING_DIR_HOST}${RENESAS_DATADIR}/include"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 OMX_EVA_PREFIX = '${@base_conditional("USE_OMX_EVA_PKG", "1", "EVA", "", d )}'
diff --git a/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-tp-user-module.bb b/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-tp-user-module.bb
index fb41431..a83d871 100644
--- a/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-tp-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-tp-user-module.bb
@@ -20,15 +20,15 @@ do_compile() {
 
 do_install() {
     # Create destination folder
-    install -d ${D}/usr/local/bin/
+    install -d ${D}${RENESAS_DATADIR}/bin/
 
     # Copy user test program
     if [ X${WS} = "X32" ]; then
-        install -m 755 ${S}/${VSPMIF_TP_DIR}/vspm_tp ${D}/usr/local/bin/vspm_tp32
-        install -m 755 ${S}/${VSPMIF_TP_DIR}/fdpm_tp ${D}/usr/local/bin/fdpm_tp32
+        install -m 755 ${S}/${VSPMIF_TP_DIR}/vspm_tp ${D}${RENESAS_DATADIR}/bin/vspm_tp32
+        install -m 755 ${S}/${VSPMIF_TP_DIR}/fdpm_tp ${D}${RENESAS_DATADIR}/bin/fdpm_tp32
     else
-        install -m 755 ${S}/${VSPMIF_TP_DIR}/vspm_tp ${D}/usr/local/bin/
-        install -m 755 ${S}/${VSPMIF_TP_DIR}/fdpm_tp ${D}/usr/local/bin/
+        install -m 755 ${S}/${VSPMIF_TP_DIR}/vspm_tp ${D}${RENESAS_DATADIR}/bin/
+        install -m 755 ${S}/${VSPMIF_TP_DIR}/fdpm_tp ${D}${RENESAS_DATADIR}/bin/
     fi
 }
 
@@ -37,10 +37,10 @@ PACKAGES = "\
     ${PN}-dbg \
 "
 FILES_${PN} = " \
-    ${@base_conditional('WS', '32', '/usr/local/bin/vspm_tp32 /usr/local/bin/fdpm_tp32', \
-    '/usr/local/bin/vspm_tp /usr/local/bin/fdpm_tp', d)}"
+    ${@base_conditional('WS', '32', '${RENESAS_DATADIR}/bin/vspm_tp32 ${RENESAS_DATADIR}/bin/fdpm_tp32', \
+    '${RENESAS_DATADIR}/bin/vspm_tp ${RENESAS_DATADIR}/bin/fdpm_tp', d)}"
 
 FILES_${PN}-dbg = " \
-    /usr/local/bin/.debug/*"
+    ${RENESAS_DATADIR}/bin/.debug/*"
 
 RPROVIDES_${PN} += "vspmif-tp-user-module"
diff --git a/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-user-module.bb b/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-user-module.bb
index 3e47d1f..bf7fef6 100644
--- a/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif-user-module.bb
@@ -11,7 +11,7 @@ VSPMIF_LIB_DIR = "vspm_if-module/files/vspm_if"
 
 EXTRA_OEMAKE = "ARCH=${TARGET_ARCH}"
 
-includedir = "/usr/local/include"
+includedir = "${RENESAS_DATADIR}/include"
 
 do_compile() {
     export VSPM_LEGACY_IF="1"