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>
---
 .../s3ctl-module/s3ctl-tp-user-module.bb                   |  6 +++---
 .../recipes-multimedia/s3ctl-module/s3ctl-user-module.bb   | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/meta-rcar-gen2/recipes-multimedia/s3ctl-module/s3ctl-tp-user-module.bb b/meta-rcar-gen2/recipes-multimedia/s3ctl-module/s3ctl-tp-user-module.bb
index 3fcc5ad..9fc34f9 100644
--- a/meta-rcar-gen2/recipes-multimedia/s3ctl-module/s3ctl-tp-user-module.bb
+++ b/meta-rcar-gen2/recipes-multimedia/s3ctl-module/s3ctl-tp-user-module.bb
@@ -13,9 +13,9 @@ do_compile() {
 
 do_install() {
     # Create shared folder
-    mkdir -p ${D}/usr/local/bin/
+    mkdir -p ${D}${RENESAS_DATADIR}/bin/
     # Copy user test program
-    cp ${S}/s3tp ${D}/usr/local/bin/
+    cp ${S}/s3tp ${D}${RENESAS_DATADIR}/bin/
 }
 
 PACKAGES = "\
@@ -25,7 +25,7 @@ PACKAGES = "\
 "
 
 FILES_${PN} = " \
-    /usr/local/bin/s3tp \
+    ${RENESAS_DATADIR}/bin/s3tp \
 "
 
 RPROVIDES_${PN} += "s3ctl-tp-user-module"
diff --git a/meta-rcar-gen2/recipes-multimedia/s3ctl-module/s3ctl-user-module.bb b/meta-rcar-gen2/recipes-multimedia/s3ctl-module/s3ctl-user-module.bb
index ed02e0a..611e0b2 100644
--- a/meta-rcar-gen2/recipes-multimedia/s3ctl-module/s3ctl-user-module.bb
+++ b/meta-rcar-gen2/recipes-multimedia/s3ctl-module/s3ctl-user-module.bb
@@ -19,12 +19,12 @@ do_compile() {
 
 do_install() {
     # Create shared folder
-    mkdir -p ${D}/usr/local/lib/ ${D}/usr/local/include/
+    mkdir -p ${D}${RENESAS_DATADIR}/lib/ ${D}${RENESAS_DATADIR}/include/
     # Copy share library
-    cp -P ${S}/if/libs3ctl.so* ${D}/usr/local/lib/
+    cp -P ${S}/if/libs3ctl.so* ${D}${RENESAS_DATADIR}/lib/
     # Copy shared header files
-    cp -f ${BUILDDIR}/include/s3ctl_user_public.h ${D}/usr/local/include/
-    cp -f ${BUILDDIR}/include/s3ctl_user_private.h ${D}/usr/local/include/
+    cp -f ${BUILDDIR}/include/s3ctl_user_public.h ${D}${RENESAS_DATADIR}/include/
+    cp -f ${BUILDDIR}/include/s3ctl_user_private.h ${D}${RENESAS_DATADIR}/include/
 }
 
 # Append function to clean extract source
@@ -44,12 +44,12 @@ PACKAGES = "\
 "
 
 FILES_${PN} = " \
-    /usr/local/lib/libs3ctl.so.* \
+    ${RENESAS_DATADIR}/lib/libs3ctl.so.* \
 "
 
 FILES_${PN}-dev = " \
-    /usr/local/lib/libs3ctl.so \
-    /usr/local/include/*.h \
+    ${RENESAS_DATADIR}/lib/libs3ctl.so \
+    ${RENESAS_DATADIR}/include/*.h \
 "
 
 RPROVIDES_${PN} += "s3ctl-user-module"
-- 
cgit 1.2.3-korg