From 536e71760745d77f629cd061c0c75681e4de1d2e Mon Sep 17 00:00:00 2001
From: Ronan Le Martret <ronan.lemartret@iot.bzh>
Date: Wed, 3 May 2017 11:04:40 +0200
Subject: [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>
---
 .../vspmif-module/vspmif-tp-user-module.bb               | 16 ++++++++--------
 .../vspmif-module/vspmif-user-module.bb                  |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'meta-rcar-gen3/recipes-multimedia/vspmif-module')

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"
-- 
cgit 1.2.3-korg