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>
---
 .../recipes-graphics/gles-module/gles-user-module.bb        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb')

diff --git a/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb b/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb
index 37e8052..c3dd808 100644
--- a/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb
+++ b/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb
@@ -1,4 +1,5 @@
 require ../../include/gles-control.inc
+require include/rcar-gen2-path-common.inc
 
 DESCRIPTION = "SGX/RGX user module"
 LICENSE = "CLOSED"
@@ -60,7 +61,12 @@ do_install() {
     # Copy binary into sysroot
     cp -r ${S}/etc ${D}
     cp -r ${S}/usr ${D}
-    mv ${D}/etc/init.d/rc.pvr ${D}/usr/local/bin/
+    mkdir -p ${D}${RENESAS_DATADIR}
+    mv ${D}/usr/local/* ${D}${RENESAS_DATADIR}
+    rm -fr ${D}/usr/local
+    mv ${D}/etc/init.d/rc.pvr ${D}${RENESAS_DATADIR}/bin/
+    sed -i "s,/usr/local,${RENESAS_DATADIR},g" \
+           ${D}${RENESAS_DATADIR}/bin/rc.pvr
     
     # Create a symbolic link for compatibility with various software
     ln -s libGLESv2.so ${D}/usr/lib/libGLESv2.so.2
@@ -68,6 +74,7 @@ do_install() {
     if [ "${USE_WAYLAND}" = "1" ]; then
         # Rename libEGL.so
         mv ${D}/usr/lib/libEGL.so ${D}/usr/lib/libEGL-pvr.so
+         
 
         # Set the "WindowSystem" parameter for wayland
         if [ "${GLES}" = "rgx" ]; then
@@ -81,6 +88,8 @@ do_install() {
     # Install systemd unit files
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -m 644 -p -D ${WORKDIR}/rc.pvr.service ${D}${systemd_system_unitdir}/rc.pvr.service
+        sed -i "s,@RENESAS_DATADIR@,${RENESAS_DATADIR},g" \
+               ${D}${systemd_system_unitdir}/rc.pvr.service
     fi
 } 
 
@@ -92,7 +101,7 @@ PACKAGES = "\
 FILES_${PN} = " \
     ${sysconfdir}/* \
     ${libdir}/* \
-    /usr/local/bin/* \
+    ${RENESAS_DATADIR}/bin/* \
 "
 
 FILES_${PN}-dev = " \
-- 
cgit 1.2.3-korg