BSP's should not ship files in /usr/local/dab_3.99.1dab/3.99.13.99.1

 * 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>

1 files changed, 28 insertions, 28 deletions

diff --git a/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb b/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb
index 841e4fd..635b8b7 100644
--- a/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb
+++ b/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb
@@ -98,10 +98,10 @@ do_collect_src() {
 do_configure() {
     cd ${S}/UDF_Linux
     ./autogen.sh
-    ./configure --prefix=${D}/usr/local/ --host=arm-linux \
+    ./configure --prefix=${D}${RENESAS_DATADIR}/ --host=arm-linux \
         CFLAGS="-I${BUILDDIR}/include -I${KERNELDIR}/include" \
         LDFLAGS="-L${LIBSHARED}" \
-        OMXR_DEFAULT_CONFIG_FILE_NAME=/usr/local/config/omxr_config_base.txt
+        OMXR_DEFAULT_CONFIG_FILE_NAME=${RENESAS_DATADIR}/config/omxr_config_base.txt
 }
 
 do_compile() {
@@ -111,11 +111,11 @@ do_compile() {
 
 do_install() {
     # Create share files
-    mkdir -p ${D}/usr/local/lib ${D}/usr/local/config
+    mkdir -p ${D}${RENESAS_DATADIR}/lib ${D}${RENESAS_DATADIR}/config
     cd ${S}/UDF_Linux
     make install
-    cp -rf ${S}/OMXR/config/*.txt ${D}/usr/local/config/
-    cp -rf ${S}/UDF_Linux/include ${D}/usr/local/include
+    cp -rf ${S}/OMXR/config/*.txt ${D}${RENESAS_DATADIR}/config/
+    cp -rf ${S}/UDF_Linux/include ${D}${RENESAS_DATADIR}/include
 
     cd ${S}/OMXR/lib/
 
@@ -262,7 +262,7 @@ do_install() {
     fi
 
     # Copy all the symbolic link and lib to destination
-    cp -Prf ${S}/OMXR/lib/* ${D}/usr/local/lib
+    cp -Prf ${S}/OMXR/lib/* ${D}${RENESAS_DATADIR}/lib
     
     # Copy the audio midleware
     # audio aacp2 midleware
@@ -273,64 +273,64 @@ do_install() {
         ln -sf libRSACPDLA_L.so.1.1 libRSACPDLA_L.so
         ln -sf libRSACPDAL_L.so.1.1 libRSACPDAL_L.so.1
         ln -sf libRSACPDAL_L.so.1.1 libRSACPDAL_L.so
-        cp -P ${S}/audio_mdw/*.so* ${D}/usr/local/lib/
-        cp -P ${S}/audio_mdw/RSACPD_ADL.h ${D}/usr/local/include
+        cp -P ${S}/audio_mdw/*.so* ${D}${RENESAS_DATADIR}/lib/
+        cp -P ${S}/audio_mdw/RSACPD_ADL.h ${D}${RENESAS_DATADIR}/include
     fi
     
     if [ "X${MP3_MDW_DECODER}" = "X1" ] ; then
         cd ${S}/audio_mdw
         ln -sf libMP3DLA_L.so.1.4 libMP3DLA_L.so.1
         ln -sf libMP3DLA_L.so.1.4 libMP3DLA_L.so
-        cp -P ${S}/audio_mdw/*.so* ${D}/usr/local/lib/
-        cp -P ${S}/audio_mdw/mp3d_Lib.h ${D}/usr/local/include
+        cp -P ${S}/audio_mdw/*.so* ${D}${RENESAS_DATADIR}/lib/
+        cp -P ${S}/audio_mdw/mp3d_Lib.h ${D}${RENESAS_DATADIR}/include
     fi
     
     if [ "X${WMA_MDW_DECODER}" = "X1" ] ; then
         cd ${S}/audio_mdw
         ln -sf libWMASTDLA_L.so.1.3 libWMASTDLA_L.so.1
         ln -sf libWMASTDLA_L.so.1.3 libWMASTDLA_L.so
-        cp -P ${S}/audio_mdw/*.so* ${D}/usr/local/lib/
-        cp -P ${S}/audio_mdw/wmastd_Lib.h ${D}/usr/local/include
+        cp -P ${S}/audio_mdw/*.so* ${D}${RENESAS_DATADIR}/lib/
+        cp -P ${S}/audio_mdw/wmastd_Lib.h ${D}${RENESAS_DATADIR}/include
     fi
 
     if [ "X${DDD_MDW_DECODER}" = "X1" ] ; then
         cd ${S}/audio_mdw
         ln -sf libRSDACDLA_L.so.1.0 libRSDACDLA_L.so.1
         ln -sf libRSDACDLA_L.so.1.0 libRSDACDLA_L.so
-        cp -P ${S}/audio_mdw/*.so* ${D}/usr/local/lib/
-        cp -P ${S}/audio_mdw/RSDACD_ADL.h ${D}/usr/local/include
+        cp -P ${S}/audio_mdw/*.so* ${D}${RENESAS_DATADIR}/lib/
+        cp -P ${S}/audio_mdw/RSDACD_ADL.h ${D}${RENESAS_DATADIR}/include
     fi
 
     if [ "X${ALAC_MDW_DECODER}" = "X1" ] ; then
         cd ${S}/audio_mdw
         ln -sf libALACDLA_L.so.1.0 libALACDLA_L.so.1
         ln -sf libALACDLA_L.so.1.0 libALACDLA_L.so
-        cp -P ${S}/audio_mdw/*.so* ${D}/usr/local/lib/
-        cp -P ${S}/audio_mdw/alacd_Lib.h ${D}/usr/local/include
+        cp -P ${S}/audio_mdw/*.so* ${D}${RENESAS_DATADIR}/lib/
+        cp -P ${S}/audio_mdw/alacd_Lib.h ${D}${RENESAS_DATADIR}/include
     fi
 
     if [ "X${FLAC_MDW_DECODER}" = "X1" ] ; then
         cd ${S}/audio_mdw
         ln -sf libFLACDLA_L.so.1.1 libFLACDLA_L.so.1
         ln -sf libFLACDLA_L.so.1.1 libFLACDLA_L.so
-        cp -P ${S}/audio_mdw/*.so* ${D}/usr/local/lib/
-        cp -P ${S}/audio_mdw/flacd_Lib.h ${D}/usr/local/include
+        cp -P ${S}/audio_mdw/*.so* ${D}${RENESAS_DATADIR}/lib/
+        cp -P ${S}/audio_mdw/flacd_Lib.h ${D}${RENESAS_DATADIR}/include
     fi
 
     if [ "X${AAC_MDW_ENCODER}" = "X1" ] ; then
         cd ${S}/audio_mdw
         ln -sf libRSAACELA_L.so.2.1 libRSAACELA_L.so.2
         ln -sf libRSAACELA_L.so.2.1 libRSAACELA_L.so
-        cp -P ${S}/audio_mdw/*.so* ${D}/usr/local/lib/
-        cp -P ${S}/audio_mdw/RSAACE_AAC.h ${D}/usr/local/include
+        cp -P ${S}/audio_mdw/*.so* ${D}${RENESAS_DATADIR}/lib/
+        cp -P ${S}/audio_mdw/RSAACE_AAC.h ${D}${RENESAS_DATADIR}/include
     fi
 }
 
 SYSROOT_PREPROCESS_FUNCS += "do_populate_share_lib"
 
 do_populate_share_lib () {
-    sysroot_stage_dir ${D}/usr/local/include ${SYSROOT_DESTDIR}/usr/include
-    sysroot_stage_dir ${D}/usr/local/lib ${SYSROOT_DESTDIR}/usr/lib
+    sysroot_stage_dir ${D}${RENESAS_DATADIR}/include ${SYSROOT_DESTDIR}/usr/include
+    sysroot_stage_dir ${D}${RENESAS_DATADIR}/lib ${SYSROOT_DESTDIR}/usr/lib
 }
 
 # Append function to clean extract source
@@ -373,18 +373,18 @@ PACKAGES = "\
 "
 
 FILES_${PN} = " \
-    /usr/local/lib/*.so \
-    /usr/local/lib/*.so.* \
-    /usr/local/config/* \
+    ${RENESAS_DATADIR}/lib/*.so \
+    ${RENESAS_DATADIR}/lib/*.so.* \
+    ${RENESAS_DATADIR}/config/* \
 "
 
 FILES_${PN}-dev = " \
-    /usr/local/include/* \
+    ${RENESAS_DATADIR}/include/* \
 "
 
 FILES_${PN}-staticdev = " \
-    /usr/local/lib/*.a \
-    /usr/local/lib/*.la \
+    ${RENESAS_DATADIR}/lib/*.a \
+    ${RENESAS_DATADIR}/lib/*.la \
 "
 
 INSANE_SKIP_${PN} += "rpaths"