summaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen3/recipes-connectivity
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2017-05-03 11:04:40 +0200
committerThao Nguyen <thao.nguyen.yb@renesas.com>2017-08-25 08:45:31 +0700
commitf3b86897081316113688a3f42e84fd48b17770b3 (patch)
tree85cf8d2d750a48d8260ce814563288a3d6f26329 /meta-rcar-gen3/recipes-connectivity
parent006e8f75ad2a6d34b8c32ed1e35052990f2425c3 (diff)
rcar-gen3: Use flexible coding style for Renesas datadir
This commit modifies recipes to use RENESAS_DATADIR variable for /usr/local directory instead of hard coding. This commit comes from AGL patch. Bug-AGL: SPEC-533 Change-Id: I865ea809c3c59ba136027fc8b99628df20c16275 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh> Signed-off-by: Thao Nguyen <thao.nguyen.yb@renesas.com> Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com> (cherry picked from commit 9598336fa2b4a4237255cdd866350eb7c03fdd81)
Diffstat (limited to 'meta-rcar-gen3/recipes-connectivity')
-rw-r--r--meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-tp-user-module.bb19
-rw-r--r--meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.bb7
2 files changed, 14 insertions, 12 deletions
diff --git a/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-tp-user-module.bb b/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-tp-user-module.bb
index 5ea1596..33a2d55 100644
--- a/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-tp-user-module.bb
+++ b/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-tp-user-module.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Linux ICCOM library test applications for Renesas R-Car Gen3"
require iccom-user-module.inc
require include/multimedia-control.inc
+require include/rcar-gen3-path-common.inc
DEPENDS = " \
kernel-module-iccom-mfis \
@@ -32,20 +33,20 @@ do_compile() {
do_install() {
# Create destination directory
- install -d ${D}/usr/local/bin
+ install -d ${D}${RENESAS_DATADIR}/bin
# Install test applications
- install -m 755 ${S}/sample_test/sample_test ${D}/usr/local/bin/
- install -m 755 ${S}/sample_test_fatal/sample_test_fatal ${D}/usr/local/bin/
- install -m 755 ${S}/sample_sharedmem/sample_sharedmem ${D}/usr/local/bin/
- install -m 755 ${S}/sample_lock/sample_lock ${D}/usr/local/bin/
+ install -m 755 ${S}/sample_test/sample_test ${D}${RENESAS_DATADIR}/bin/
+ install -m 755 ${S}/sample_test_fatal/sample_test_fatal ${D}${RENESAS_DATADIR}/bin/
+ install -m 755 ${S}/sample_sharedmem/sample_sharedmem ${D}${RENESAS_DATADIR}/bin/
+ install -m 755 ${S}/sample_lock/sample_lock ${D}${RENESAS_DATADIR}/bin/
}
FILES_${PN} = " \
- /usr/local/bin/sample_test \
- /usr/local/bin/sample_test_fatal \
- /usr/local/bin/sample_sharedmem \
- /usr/local/bin/sample_lock \
+ ${RENESAS_DATADIR}/bin/sample_test \
+ ${RENESAS_DATADIR}/bin/sample_test_fatal \
+ ${RENESAS_DATADIR}/bin/sample_sharedmem \
+ ${RENESAS_DATADIR}/bin/sample_lock \
"
# Skip debug split
diff --git a/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.bb b/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.bb
index a735271..dc269b8 100644
--- a/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.bb
+++ b/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.bb
@@ -1,6 +1,7 @@
DESCRIPTION = "Linux ICCOM library for Renesas R-Car Gen3"
require iccom-user-module.inc
+require include/rcar-gen3-path-common.inc
DEPENDS = " \
kernel-module-iccom-mfis \
@@ -19,13 +20,13 @@ B = "${S}/source"
do_install() {
# Create destination directories
install -d ${D}/${libdir}
- install -d ${D}/usr/local/include
+ install -d ${D}${RENESAS_DATADIR}/include
# Install library
install -m 755 ${B}/libiccom.so ${D}/${libdir}/
# Install shared header file
- install -m 644 ${S}/include/iccom_if_app.h ${D}/usr/local/include/
+ install -m 644 ${S}/include/iccom_if_app.h ${D}${RENESAS_DATADIR}/include/
}
FILES_${PN} = " \
@@ -33,7 +34,7 @@ FILES_${PN} = " \
"
FILES_${PN}-dev = " \
- /usr/local/include/iccom_if_app.h \
+ ${RENESAS_DATADIR}/include/iccom_if_app.h \
"
# Skip debug split