aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2017-04-21 16:32:43 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-04-26 21:02:41 +0000
commit39902b66a174446a49e1083c357d86b74daef425 (patch)
treec73408c05ed25ca52385bba68e0da2137dc8c428
parent118df1f34368be06401824a6c5b2bb670e53be81 (diff)
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>
-rw-r--r--common/recipes-graphics/directfb/directfb/fbdev-uiomux-register.patch4
-rw-r--r--common/recipes-graphics/directfb/directfb_1.6.3.bbappend7
-rw-r--r--meta-rcar-gen2/include/rcar-gen2-modules-common.inc2
-rw-r--r--meta-rcar-gen2/include/rcar-gen2-path-common.inc1
-rw-r--r--meta-rcar-gen2/recipes-core/base-files/base-files_3.0.14.bbappend3
-rw-r--r--meta-rcar-gen2/recipes-core/libmemcpy/libmemcpy_1.0.bb10
-rw-r--r--meta-rcar-gen2/recipes-graphics/gles-module/gles-test-module.bb18
-rw-r--r--meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb13
-rw-r--r--meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module/rc.pvr.service6
-rw-r--r--meta-rcar-gen2/recipes-multimedia/dtv-module/dtv-user-module.bb18
-rw-r--r--meta-rcar-gen2/recipes-multimedia/fdpm-module/fdpm-tp-user-module.bb6
-rw-r--r--meta-rcar-gen2/recipes-multimedia/fdpm-module/fdpm-user-module.bb12
-rw-r--r--meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf14
-rw-r--r--meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend3
-rw-r--r--meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngr-tp-user-module.bb6
-rw-r--r--meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngr-user-module.bb20
-rw-r--r--meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngrbuf-tp-user-module.bb6
-rw-r--r--meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb20
-rw-r--r--meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb56
-rw-r--r--meta-rcar-gen2/recipes-multimedia/s3ctl-module/s3ctl-tp-user-module.bb6
-rw-r--r--meta-rcar-gen2/recipes-multimedia/s3ctl-module/s3ctl-user-module.bb14
-rw-r--r--meta-rcar-gen2/recipes-multimedia/vspm-module/vspm-tp-user-module.bb6
-rw-r--r--meta-rcar-gen2/recipes-multimedia/vspm-module/vspm-user-module.bb22
23 files changed, 151 insertions, 122 deletions
diff --git a/common/recipes-graphics/directfb/directfb/fbdev-uiomux-register.patch b/common/recipes-graphics/directfb/directfb/fbdev-uiomux-register.patch
index 9bea5a3..725e02e 100644
--- a/common/recipes-graphics/directfb/directfb/fbdev-uiomux-register.patch
+++ b/common/recipes-graphics/directfb/directfb/fbdev-uiomux-register.patch
@@ -28,7 +28,7 @@ diff -ru DirectFB-1.6.0//systems/fbdev/Makefile.am ../DirectFB-1.6.0//systems/fb
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/src
+ -I$(top_srcdir)/src \
-+ -I/usr/local/include
++ -I@RENESAS_DATADIR@/include
AM_CPPFLAGS = -D_XOPEN_SOURCE=500
@@ -38,7 +38,7 @@ diff -ru DirectFB-1.6.0//systems/fbdev/Makefile.am ../DirectFB-1.6.0//systems/fb
-avoid-version \
- -module
+ -module \
-+ -L/usr/local/lib
++ -L@RENESAS_DATADIR@/lib
libdirectfb_fbdev_la_SOURCES = \
agp.c \
diff --git a/common/recipes-graphics/directfb/directfb_1.6.3.bbappend b/common/recipes-graphics/directfb/directfb_1.6.3.bbappend
index 4d839a4..f813c78 100644
--- a/common/recipes-graphics/directfb/directfb_1.6.3.bbappend
+++ b/common/recipes-graphics/directfb/directfb_1.6.3.bbappend
@@ -1,6 +1,13 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI_append_armadillo800eva = " file://fbdev-uiomux-register.patch"
+require include/rcar-gen2-path-common.inc
+
EXTRA_OECONF += "\
--with-inputdrivers=linuxinput \
"
+
+do_configure_prepend_armadillo800eva() {
+ sed -i "s,@RENESAS_DATADIR@,${RENESAS_DATADIR},g" \
+ ${S}/systems/fbdev/Makefile.am
+}
diff --git a/meta-rcar-gen2/include/rcar-gen2-modules-common.inc b/meta-rcar-gen2/include/rcar-gen2-modules-common.inc
index 4a3658a..badf89b 100644
--- a/meta-rcar-gen2/include/rcar-gen2-modules-common.inc
+++ b/meta-rcar-gen2/include/rcar-gen2-modules-common.inc
@@ -6,4 +6,6 @@ export KERNELDIR = "${STAGING_KERNEL_DIR}"
export LDFLAGS = ""
export CP = "cp"
+require include/rcar-gen2-path-common.inc
+
inherit module
diff --git a/meta-rcar-gen2/include/rcar-gen2-path-common.inc b/meta-rcar-gen2/include/rcar-gen2-path-common.inc
new file mode 100644
index 0000000..d2b0e21
--- /dev/null
+++ b/meta-rcar-gen2/include/rcar-gen2-path-common.inc
@@ -0,0 +1 @@
+export RENESAS_DATADIR = "/usr/share/renesas"
diff --git a/meta-rcar-gen2/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-rcar-gen2/recipes-core/base-files/base-files_3.0.14.bbappend
index 9d6092b..14f635b 100644
--- a/meta-rcar-gen2/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/meta-rcar-gen2/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,7 +1,8 @@
require meta-rcar-gen2/include/multimedia-control.inc
+require include/rcar-gen2-path-common.inc
do_install_append () {
if [ "X${USE_MULTIMEDIA}" = "X1" ] ; then
- echo "export LD_LIBRARY_PATH=\"/usr/local/lib\"" >> ${D}${sysconfdir}/profile
+ echo "export LD_LIBRARY_PATH=\"${RENESAS_DATADIR}/lib\"" >> ${D}${sysconfdir}/profile
fi
}
diff --git a/meta-rcar-gen2/recipes-core/libmemcpy/libmemcpy_1.0.bb b/meta-rcar-gen2/recipes-core/libmemcpy/libmemcpy_1.0.bb
index 22f5381..c2887cb 100644
--- a/meta-rcar-gen2/recipes-core/libmemcpy/libmemcpy_1.0.bb
+++ b/meta-rcar-gen2/recipes-core/libmemcpy/libmemcpy_1.0.bb
@@ -3,10 +3,16 @@ SECTION = "dev"
LICENSE = "LGPL-2.1"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
+require include/rcar-gen2-path-common.inc
+
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI = "file://libmemcpy-1.0.tar.bz2"
inherit autotools
-prefix="/usr/local/lib"
-exec_prefix="/usr/local"
+prefix="${RENESAS_DATADIR}/lib"
+exec_prefix="${RENESAS_DATADIR}"
+
+FILES_${PN} += " \
+ ${RENESAS_DATADIR} \
+"
diff --git a/meta-rcar-gen2/recipes-graphics/gles-module/gles-test-module.bb b/meta-rcar-gen2/recipes-graphics/gles-module/gles-test-module.bb
index 7a8fcb9..6686fb7 100644
--- a/meta-rcar-gen2/recipes-graphics/gles-module/gles-test-module.bb
+++ b/meta-rcar-gen2/recipes-graphics/gles-module/gles-test-module.bb
@@ -5,6 +5,8 @@ PN = "gles-test-module"
PR = "r0"
OPENGLES3 ?= "0"
+require include/rcar-gen2-path-common.inc
+
COMPATIBLE_MACHINE = "(r8a7790|r8a7791|r8a7793|r8a7794)"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -22,15 +24,15 @@ do_compile() {
do_install() {
# Copy binary into sysroot
- mkdir -p ${D}/usr/local/bin/
+ mkdir -p ${D}${RENESAS_DATADIR}/bin/
if [ "X${OPENGLES3}" = "X0" ]; then
- cp ${S}/OES2_Texture ${D}/usr/local/bin/
- cp ${S}/FragShaderSample.fsh ${D}/usr/local/bin/
- cp ${S}/VertShaderSample.vsh ${D}/usr/local/bin/
+ cp ${S}/OES2_Texture ${D}${RENESAS_DATADIR}/bin/
+ cp ${S}/FragShaderSample.fsh ${D}${RENESAS_DATADIR}/bin/
+ cp ${S}/VertShaderSample.vsh ${D}${RENESAS_DATADIR}/bin/
else
- cp ${S}/OES3_Texture ${D}/usr/local/bin/
- cp ${S}/OES3_FragShaderSample.fsh ${D}/usr/local/bin/
- cp ${S}/OES3_VertShaderSample.vsh ${D}/usr/local/bin/
+ cp ${S}/OES3_Texture ${D}${RENESAS_DATADIR}/bin/
+ cp ${S}/OES3_FragShaderSample.fsh ${D}${RENESAS_DATADIR}/bin/
+ cp ${S}/OES3_VertShaderSample.vsh ${D}${RENESAS_DATADIR}/bin/
fi
}
@@ -38,7 +40,7 @@ PACKAGES = "\
${PN} \
"
FILES_${PN} = " \
- /usr/local/bin/* \
+ ${RENESAS_DATADIR}/bin/* \
"
RPROVIDES_${PN} += "gles-test-module"
INSANE_SKIP_${PN} += "ldflags"
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 = " \
diff --git a/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module/rc.pvr.service b/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module/rc.pvr.service
index 5aec697..a0e0321 100644
--- a/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module/rc.pvr.service
+++ b/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module/rc.pvr.service
@@ -1,6 +1,6 @@
[Unit]
-SourcePath=/usr/local/bin/rc.pvr
+SourcePath=@RENESAS_DATADIR@/bin/rc.pvr
Before=weston.service
[Service]
@@ -11,8 +11,8 @@ IgnoreSIGPIPE=no
KillMode=process
GuessMainPID=no
RemainAfterExit=yes
-ExecStart=/usr/local/bin/rc.pvr start
-ExecStop=/usr/local/bin/rc.pvr stop
+ExecStart=@RENESAS_DATADIR@/bin/rc.pvr start
+ExecStop=@RENESAS_DATADIR@/bin/rc.pvr stop
[Install]
RequiredBy=weston.service
diff --git a/meta-rcar-gen2/recipes-multimedia/dtv-module/dtv-user-module.bb b/meta-rcar-gen2/recipes-multimedia/dtv-module/dtv-user-module.bb
index 7b8e5ca..0bfc9af 100644
--- a/meta-rcar-gen2/recipes-multimedia/dtv-module/dtv-user-module.bb
+++ b/meta-rcar-gen2/recipes-multimedia/dtv-module/dtv-user-module.bb
@@ -14,18 +14,18 @@ do_populate_lic[noexec] = "1"
do_install() {
# Create share folders
- mkdir -p ${D}/usr/local/include/ ${D}/usr/local/lib ${D}/usr/local/src/dtv/reference
+ mkdir -p ${D}${RENESAS_DATADIR}/include/ ${D}${RENESAS_DATADIR}/lib ${D}${RENESAS_DATADIR}/src/dtv/reference
# Copy share files to destination
- cp -f ${WORKDIR}/dtv/include/*.h ${D}/usr/local/include/
- cp -f ${WORKDIR}/dtv/lib/libdtv.a ${D}/usr/local/lib
- cp -f ${WORKDIR}/dtv/userfunc/* ${D}/usr/local/src/dtv/reference
+ cp -f ${WORKDIR}/dtv/include/*.h ${D}${RENESAS_DATADIR}/include/
+ cp -f ${WORKDIR}/dtv/lib/libdtv.a ${D}${RENESAS_DATADIR}/lib
+ cp -f ${WORKDIR}/dtv/userfunc/* ${D}${RENESAS_DATADIR}/src/dtv/reference
}
SYSROOT_PREPROCESS_FUNCS += "do_populate_reference_src"
do_populate_reference_src () {
- sysroot_stage_dir ${D}/usr/local ${SYSROOT_DESTDIR}/usr/local
+ sysroot_stage_dir ${D}${RENESAS_DATADIR} ${SYSROOT_DESTDIR}${RENESAS_DATADIR}
}
PACKAGES = "\
@@ -38,13 +38,13 @@ FILES_${PN} = ""
ALLOW_EMPTY_${PN} = "1"
FILES_${PN}-dev = " \
- /usr/local/include/*.h \
- /usr/local/src/dtv/reference/*.c \
- /usr/local/src/dtv/reference/*.h \
+ ${RENESAS_DATADIR}/include/*.h \
+ ${RENESAS_DATADIR}/src/dtv/reference/*.c \
+ ${RENESAS_DATADIR}/src/dtv/reference/*.h \
"
FILES_${PN}-staticdev = " \
- /usr/local/lib/*.a \
+ ${RENESAS_DATADIR}/lib/*.a \
"
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
diff --git a/meta-rcar-gen2/recipes-multimedia/fdpm-module/fdpm-tp-user-module.bb b/meta-rcar-gen2/recipes-multimedia/fdpm-module/fdpm-tp-user-module.bb
index 2f01ed3..6e65645 100644
--- a/meta-rcar-gen2/recipes-multimedia/fdpm-module/fdpm-tp-user-module.bb
+++ b/meta-rcar-gen2/recipes-multimedia/fdpm-module/fdpm-tp-user-module.bb
@@ -13,10 +13,10 @@ 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}/fdpm/fdpm_tp ${D}/usr/local/bin/
+ cp ${S}/fdpm/fdpm_tp ${D}${RENESAS_DATADIR}/bin/
}
PACKAGES = "\
@@ -24,7 +24,7 @@ PACKAGES = "\
"
FILES_${PN} = " \
- /usr/local/bin/fdpm_tp \
+ ${RENESAS_DATADIR}/bin/fdpm_tp \
"
RPROVIDES_${PN} += "fdpm-tp-user-module"
diff --git a/meta-rcar-gen2/recipes-multimedia/fdpm-module/fdpm-user-module.bb b/meta-rcar-gen2/recipes-multimedia/fdpm-module/fdpm-user-module.bb
index 7146a2a..3045560 100644
--- a/meta-rcar-gen2/recipes-multimedia/fdpm-module/fdpm-user-module.bb
+++ b/meta-rcar-gen2/recipes-multimedia/fdpm-module/fdpm-user-module.bb
@@ -19,11 +19,11 @@ 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}/if/libfdpm.so* ${D}/usr/local/lib
- cp -rf ${S}/include/*h ${D}/usr/local/include/
+ cp -P ${S}/if/libfdpm.so* ${D}${RENESAS_DATADIR}/lib
+ cp -rf ${S}/include/*h ${D}${RENESAS_DATADIR}/include/
}
# Append function to clean extract source
@@ -48,12 +48,12 @@ PACKAGES = "\
"
FILES_${PN} = " \
- /usr/local/lib/libfdpm.so.* \
+ ${RENESAS_DATADIR}/lib/libfdpm.so.* \
"
FILES_${PN}-dev = " \
- /usr/local/lib/libfdpm.so \
- /usr/local/include/*.h \
+ ${RENESAS_DATADIR}/lib/libfdpm.so \
+ ${RENESAS_DATADIR}/include/*.h \
"
RPROVIDES_${PN} += "fdpm-user-module"
diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf
index 375e201..d36d3c4 100644
--- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf
+++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf
@@ -1,6 +1,6 @@
[omxh263dec]
type-name=GstOMXH263Dec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=${RENESAS_DATADIR}/lib/libomxr_core.so
component-name=OMX.RENESAS.VIDEO.DECODER.H263
rank=512
in-port-index=0
@@ -9,7 +9,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang
[omxh264dec]
type-name=GstOMXH264Dec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=${RENESAS_DATADIR}/lib/libomxr_core.so
component-name=OMX.RENESAS.VIDEO.DECODER.H264
rank=512
in-port-index=0
@@ -18,7 +18,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang
[omxmpeg2videodec]
type-name=GstOMXMPEG2VideoDec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=${RENESAS_DATADIR}/lib/libomxr_core.so
component-name=OMX.RENESAS.VIDEO.DECODER.MPEG2
rank=512
in-port-index=0
@@ -27,7 +27,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang
[omxmpeg4videodec]
type-name=GstOMXMPEG4VideoDec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=${RENESAS_DATADIR}/lib/libomxr_core.so
component-name=OMX.RENESAS.VIDEO.DECODER.MPEG4
rank=512
in-port-index=0
@@ -36,7 +36,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang
[omxvc1videodec]
type-name=GstOMXVC1VideoDec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=${RENESAS_DATADIR}/lib/libomxr_core.so
component-name=OMX.RENESAS.VIDEO.DECODER.VC1
rank=512
in-port-index=0
@@ -45,7 +45,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang
[omxaacdec]
type-name=GstOMXAACDec
-core-name=/usr/local/lib/libomxr_core.so
+core-name=${RENESAS_DATADIR}/lib/libomxr_core.so
component-name=OMX.RENESAS.AUDIO.DECODER.AAC
rank=256
in-port-index=0
@@ -54,7 +54,7 @@ hacks=
[omxh264enc]
type-name=GstOMXH264Enc
-core-name=/usr/local/lib/libomxr_core.so
+core-name=${RENESAS_DATADIR}/lib/libomxr_core.so
component-name=OMX.RENESAS.VIDEO.ENCODER.H264
rank=256
in-port-index=0
diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend
index 426f0c4..6ff948c 100644
--- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend
+++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend
@@ -1,4 +1,5 @@
require ../../include/gles-control.inc
+require include/rcar-gen2-path-common.inc
SRC_URI_rcar-gen2 = "git://github.com/renesas-devel/gst-omx.git;protocol=git;branch=RCAR-GEN2/1.0.0"
SRCREV_rcar-gen2 = "${@'e0a23fb50ec211a8058eac223847bbcc574fb343' \
@@ -24,7 +25,7 @@ EXTRA_OECONF_append_rcar-gen2 = " \
# Overwrite do_install[postfuncs] += " set_omx_core_name "
# because it will force the plugin to use bellagio instead of our config
revert_omx_core_name() {
- sed -i -e "s;^core-name=.*;core-name=/usr/local/lib/libomxr_core.so;" "${D}/etc/xdg/gstomx.conf"
+ sed -i -e "s;^core-name=.*;core-name=${RENESAS_DATADIR}/lib/libomxr_core.so;" "${D}/etc/xdg/gstomx.conf"
}
REVERT_OMX_CORE_NAME = ""
diff --git a/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngr-tp-user-module.bb b/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngr-tp-user-module.bb
index 515f784..de21e32 100644
--- a/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngr-tp-user-module.bb
+++ b/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngr-tp-user-module.bb
@@ -14,15 +14,15 @@ do_compile() {
do_install() {
# Copy kernel test program
- mkdir -p ${D}/usr/local/bin/
- cp ${S}/mmtp ${D}/usr/local/bin/
+ mkdir -p ${D}${RENESAS_DATADIR}/bin/
+ cp ${S}/mmtp ${D}${RENESAS_DATADIR}/bin/
}
PACKAGES = "\
${PN} \
"
FILES_${PN} = " \
- /usr/local/bin/mmtp \
+ ${RENESAS_DATADIR}/bin/mmtp \
"
RPROVIDES_${PN} += "mmngr-tp-user-module"
diff --git a/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngr-user-module.bb b/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngr-user-module.bb
index 3205915..d150d8a 100644
--- a/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngr-user-module.bb
+++ b/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngr-user-module.bb
@@ -16,14 +16,14 @@ do_compile() {
}
do_install() {
- 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}/if/libmmngr.so* ${D}/usr/local/lib/
- cd ${D}/usr/local/lib/
+ cp -P ${S}/if/libmmngr.so* ${D}${RENESAS_DATADIR}/lib/
+ cd ${D}${RENESAS_DATADIR}/lib/
# Copy shared header files
- cp -f ${BUILDDIR}/include/mmngr_user_public.h ${D}/usr/local/include
- cp -f ${BUILDDIR}/include/mmngr_user_private.h ${D}/usr/local/include
+ cp -f ${BUILDDIR}/include/mmngr_user_public.h ${D}${RENESAS_DATADIR}/include
+ cp -f ${BUILDDIR}/include/mmngr_user_private.h ${D}${RENESAS_DATADIR}/include
}
# Append function to clean extract source
@@ -43,14 +43,14 @@ PACKAGES = "\
"
FILES_${PN} = " \
- /usr/local/lib/libmmngr.so.* \
+ ${RENESAS_DATADIR}/lib/libmmngr.so.* \
"
FILES_${PN}-dev = " \
- /usr/local/include \
- /usr/local/include/*.h \
- /usr/local/lib \
- /usr/local/lib/libmmngr.so \
+ ${RENESAS_DATADIR}/include \
+ ${RENESAS_DATADIR}/include/*.h \
+ ${RENESAS_DATADIR}/lib \
+ ${RENESAS_DATADIR}/lib/libmmngr.so \
"
RPROVIDES_${PN} += "mmngr-user-module"
diff --git a/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngrbuf-tp-user-module.bb b/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngrbuf-tp-user-module.bb
index c07945d..0f96acd 100644
--- a/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngrbuf-tp-user-module.bb
+++ b/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngrbuf-tp-user-module.bb
@@ -14,15 +14,15 @@ do_compile() {
do_install() {
# Copy kernel test program
- mkdir -p ${D}/usr/local/bin/
- cp ${S}/mmbuftp ${D}/usr/local/bin/
+ mkdir -p ${D}${RENESAS_DATADIR}/bin/
+ cp ${S}/mmbuftp ${D}${RENESAS_DATADIR}/bin/
}
PACKAGES = "\
${PN} \
"
FILES_${PN} = " \
- /usr/local/bin/mmbuftp \
+ ${RENESAS_DATADIR}/bin/mmbuftp \
"
RPROVIDES_${PN} += "mmngrbuf-tp-user-module"
diff --git a/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb b/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb
index d2f90e0..fb5c114 100644
--- a/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb
+++ b/meta-rcar-gen2/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb
@@ -18,14 +18,14 @@ do_compile() {
}
do_install() {
- 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}/if/libmmngrbuf.so* ${D}/usr/local/lib/
- cd ${D}/usr/local/lib/
+ cp -P ${S}/if/libmmngrbuf.so* ${D}${RENESAS_DATADIR}/lib/
+ cd ${D}${RENESAS_DATADIR}/lib/
# Copy shared header files
- cp -f ${BUILDDIR}/include/mmngr_buf_user_public.h ${D}/usr/local/include
- cp -f ${BUILDDIR}/include/mmngr_buf_user_private.h ${D}/usr/local/include
+ cp -f ${BUILDDIR}/include/mmngr_buf_user_public.h ${D}${RENESAS_DATADIR}/include
+ cp -f ${BUILDDIR}/include/mmngr_buf_user_private.h ${D}${RENESAS_DATADIR}/include
}
# Append function to clean extract source
@@ -45,14 +45,14 @@ PACKAGES = "\
"
FILES_${PN} = " \
- /usr/local/lib/libmmngrbuf.so.* \
+ ${RENESAS_DATADIR}/lib/libmmngrbuf.so.* \
"
FILES_${PN}-dev = " \
- /usr/local/include \
- /usr/local/include/*.h \
- /usr/local/lib \
- /usr/local/lib/libmmngrbuf.so \
+ ${RENESAS_DATADIR}/include \
+ ${RENESAS_DATADIR}/include/*.h \
+ ${RENESAS_DATADIR}/lib \
+ ${RENESAS_DATADIR}/lib/libmmngrbuf.so \
"
RPROVIDES_${PN} += "mmngrbuf-user-module"
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"
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"
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"