From c60384cd154c0f38a10b0930e68936114e69a1e1 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 "${RENESAS_DATADIR}/include" 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>
---
 meta-rcar-gen3/include/rcar-gen3-path-common.inc                | 2 +-
 meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta-rcar-gen3/include/rcar-gen3-path-common.inc b/meta-rcar-gen3/include/rcar-gen3-path-common.inc
index 7d89374..d01a044 100644
--- a/meta-rcar-gen3/include/rcar-gen3-path-common.inc
+++ b/meta-rcar-gen3/include/rcar-gen3-path-common.inc
@@ -1 +1 @@
-export RENESAS_DATADIR = "/usr/local"
+export RENESAS_DATADIR = "/usr"
diff --git a/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb b/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb
index 25a399c..14a4c5d 100644
--- a/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb
+++ b/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb
@@ -1,4 +1,5 @@
 require include/gles-control.inc
+require include/rcar-gen3-path-common.inc
 
 DESCRIPTION = "PowerVR GPU user module"
 LICENSE = "CLOSED"
@@ -52,8 +53,8 @@ do_install() {
     # Install pre-builded binaries
     install -d ${D}/${libdir}
     install -m 755 ${S}/${libdir}/*.so ${D}/${libdir}/
-    install -d ${D}/${exec_prefix}/local/bin
-    install -m 755 ${S}/${exec_prefix}/local/bin/dlcsrv_REL ${D}/${exec_prefix}/local/bin/dlcsrv_REL
+    install -d ${D}/${RENESAS_DATADIR}/bin
+    install -m 755 ${S}/usr/local/bin/dlcsrv_REL ${D}/${RENESAS_DATADIR}/bin/dlcsrv_REL
     install -d ${D}/lib/firmware
     install -m 644 ${S}/lib/firmware/* ${D}/lib/firmware/
 
@@ -93,7 +94,7 @@ FILES_${PN} = " \
     ${sysconfdir}/* \
     ${libdir}/* \
     /lib/firmware/rgx.fw* \
-    ${localedir}/bin/* \
+    ${RENESAS_DATADIR}/bin/* \
     ${exec_prefix}/bin/* \
 "
 
@@ -104,7 +105,7 @@ FILES_${PN}-dev = " \
 
 PROVIDES = "virtual/libgles2"
 FILES_${PN}-debug = " \
-    ${exec_prefix}/local/bin/dlcsrv_REL \
+    ${RENESAS_DATADIR}/bin/dlcsrv_REL \
 "
 
 RPROVIDES_${PN} += " \
-- 
cgit 1.2.3-korg