diff options
| author |   Ronan Le Martret <ronan.lemartret@iot.bzh> | 2017-05-03 11:04:40 +0200 |
|---|---|---|
| committer |   Thao Nguyen <thao.nguyen.yb@renesas.com> | 2017-08-25 08:45:31 +0700 |
| commit | f3b86897081316113688a3f42e84fd48b17770b3 (patch) | |
| tree | 85cf8d2d750a48d8260ce814563288a3d6f26329 /meta-rcar-gen3/recipes-multimedia/mmngr-module | |
| parent | 006e8f75ad2a6d34b8c32ed1e35052990f2425c3 (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-multimedia/mmngr-module')
| -rw-r--r-- | meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr-user-module.bb | 10 | ||||
| -rw-r--r-- | meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr-user-module.bb b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr-user-module.bb index b22490e..ac4cf30 100644 --- a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr-user-module.bb +++ b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr-user-module.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Memory Manager User module for Renesas R-Car Gen3" require mmngr_lib.inc +require include/rcar-gen3-path-common.inc DEPENDS = "kernel-module-mmngr" PN = "mmngr-user-module" @@ -11,13 +12,14 @@ EXTRA_OECONF = "${@bb.utils.contains("DISTRO_FEATURES", "mm-test", \ " --enable-mmngr-test", "", d)}" exec_prefix = "/usr" -bindir = "/usr/local/bin" -includedir = "/usr/local/include" +bindir = "${RENESAS_DATADIR}/bin" +includedir = "${RENESAS_DATADIR}/include" +CFLAGS += " -I${STAGING_DIR_HOST}${RENESAS_DATADIR}/include" do_install_append() { - if [ -f ${D}/usr/local/bin/mmtp ]; then + if [ -f ${D}${RENESAS_DATADIR}/bin/mmtp ]; then if [ X${WS} = "X32" ]; then - mv ${D}/usr/local/bin/mmtp ${D}/usr/local/bin/mmtp${WS} + mv ${D}${RENESAS_DATADIR}/bin/mmtp ${D}${RENESAS_DATADIR}/bin/mmtp${WS} fi fi } diff --git a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb index 916d567..690169f 100644 --- a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb +++ b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngrbuf-user-module.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Memory Manager Buffer User module for Renesas R-Car Gen3" require mmngr_lib.inc +require include/rcar-gen3-path-common.inc DEPENDS = "kernel-module-mmngrbuf" PN = "mmngrbuf-user-module" @@ -11,13 +12,14 @@ EXTRA_OECONF = "${@bb.utils.contains("DISTRO_FEATURES", "mm-test", \ " --enable-mmngrbuf-test", "", d)}" exec_prefix = "/usr" -bindir = "/usr/local/bin" -includedir = "/usr/local/include" +bindir = "${RENESAS_DATADIR}/bin" +includedir = "${RENESAS_DATADIR}/include" +CFLAGS += " -I${STAGING_DIR_HOST}${RENESAS_DATADIR}/include" do_install_append() { - if [ -f ${D}/usr/local/bin/mmbuftp ]; then + if [ -f ${D}${RENESAS_DATADIR}/bin/mmbuftp ]; then if [ X${WS} = "X32" ]; then - mv ${D}/usr/local/bin/mmbuftp ${D}/usr/local/bin/mmbuftp${WS} + mv ${D}${RENESAS_DATADIR}/bin/mmbuftp ${D}${RENESAS_DATADIR}/bin/mmbuftp${WS} fi fi } |