From 39902b66a174446a49e1083c357d86b74daef425 Mon Sep 17 00:00:00 2001
From: Ronan Le Martret <ronan.lemartret@iot.bzh>
Date: Fri, 21 Apr 2017 16:32:43 +0200
Subject: BSP's should not ship files in /usr/local/

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

Bug-AGL: SPEC-533

Change-Id: I66350e850df385e901dc4a0ff56bf04452f90868
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
---
 .../vspm-module/vspm-tp-user-module.bb             |  6 +++---
 .../vspm-module/vspm-user-module.bb                | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

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

diff --git a/meta-rcar-gen2/recipes-multimedia/vspm-module/vspm-tp-user-module.bb b/meta-rcar-gen2/recipes-multimedia/vspm-module/vspm-tp-user-module.bb
index b7b97a0..d765f72 100644
--- a/meta-rcar-gen2/recipes-multimedia/vspm-module/vspm-tp-user-module.bb
+++ b/meta-rcar-gen2/recipes-multimedia/vspm-module/vspm-tp-user-module.bb
@@ -12,17 +12,17 @@ do_compile() {
 
 do_install() {
     # Create destination folder
-    mkdir -p ${D}/usr/local/bin/
+    mkdir -p ${D}${RENESAS_DATADIR}/bin/
 
     # Copy user test program
-    cp ${S}/vspm/vspm_tp ${D}/usr/local/bin/
+    cp ${S}/vspm/vspm_tp ${D}${RENESAS_DATADIR}/bin/
 }
 
 PACKAGES = "\
     ${PN} \
 "
 FILES_${PN} = " \
-    /usr/local/bin/vspm_tp \
+    ${RENESAS_DATADIR}/bin/vspm_tp \
 "
 
 RPROVIDES_${PN} += "vspm-tp-user-module"
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 3327861..079a0d9 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
@@ -19,13 +19,13 @@ do_compile() {
 
 do_install() {
     # Create destination folder
-    mkdir -p ${D}/usr/local/lib/ ${D}/usr/local/include
+    mkdir -p ${D}${RENESAS_DATADIR}/lib/ ${D}${RENESAS_DATADIR}/include
     # Copy shared library
-    cp -P ${S}/vspm/if/libvspm.so* ${D}/usr/local/lib/
+    cp -P ${S}/vspm/if/libvspm.so* ${D}${RENESAS_DATADIR}/lib/
     # Copy shared header files
-    cp -f ${BUILDDIR}/include/vspm_public.h ${D}/usr/local/include
-    cp -f ${BUILDDIR}/include/vsp_drv.h ${D}/usr/local/include
-    cp -f ${BUILDDIR}/include/tddmac_drv.h ${D}/usr/local/include
+    cp -f ${BUILDDIR}/include/vspm_public.h ${D}${RENESAS_DATADIR}/include
+    cp -f ${BUILDDIR}/include/vsp_drv.h ${D}${RENESAS_DATADIR}/include
+    cp -f ${BUILDDIR}/include/tddmac_drv.h ${D}${RENESAS_DATADIR}/include
 }
 
 do_clean_source() {
@@ -41,15 +41,15 @@ PACKAGES = "\
 "
 
 FILES_${PN} = " \
-    /usr/local/lib/libvspm.so.* \
+    ${RENESAS_DATADIR}/lib/libvspm.so.* \
 "
 
 FILES_${PN}-dev = " \
-    /usr/local/lib \
-    /usr/local/lib/libvspm.so \
-    /usr/local/lib/* \
-    /usr/local/include \
-    /usr/local/include/*.h \
+    ${RENESAS_DATADIR}/lib \
+    ${RENESAS_DATADIR}/lib/libvspm.so \
+    ${RENESAS_DATADIR}/lib/* \
+    ${RENESAS_DATADIR}/include \
+    ${RENESAS_DATADIR}/include/*.h \
 "
 
 RPROVIDES_${PN} += "vspm-user-module"
-- 
cgit 1.2.3-korg