From 38e3c83401c7ef0dc71fdb0fe55a439d67993c3d Mon Sep 17 00:00:00 2001
From: Daiane Angolini <daiane.angolini@nxp.com>
Date: Wed, 10 Aug 2016 17:35:48 -0300
Subject: firmware-imx: Rework recipe to use base_libdir

Rework recipe to use ${base_libdir} instead of pointing direct to the "lib/" path.

Signed-off-by: Daiane Angolini <daiane.angolini@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/firmware-imx/firmware-imx.inc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
index 558f7fb..3aa99a6 100644
--- a/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -11,28 +11,28 @@ SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true"
 inherit fsl-eula-unpack
 
 do_install() {
-    install -d ${D}/lib/firmware/imx
-    cp -rfv firmware/* ${D}/lib/firmware/
+    install -d ${D}${base_libdir}/firmware/imx
+    cp -rfv firmware/* ${D}${base_libdir}/firmware/
 
-    mv ${D}/lib/firmware/epdc/ ${D}/lib/firmware/imx/epdc/
-    mv ${D}/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw
+    mv ${D}${base_libdir}/firmware/epdc/ ${D}${base_libdir}/firmware/imx/epdc/
+    mv ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw
 
-    find ${D}/lib/firmware -type f -exec chmod 644 '{}' ';'
-    find ${D}/lib/firmware -type f -exec chown root:root '{}' ';'
+    find ${D}${base_libdir}/firmware -type f -exec chmod 644 '{}' ';'
+    find ${D}${base_libdir}/firmware -type f -exec chown root:root '{}' ';'
 
     # Remove files not going to be installed
-    find ${D}/lib/firmware/ -name '*.mk' -exec rm '{}' ';'
+    find ${D}${base_libdir}/firmware/ -name '*.mk' -exec rm '{}' ';'
 }
 
 python populate_packages_prepend() {
-    vpudir = bb.data.expand('/lib/firmware/vpu', d)
+    vpudir = bb.data.expand('${base_libdir}/firmware/vpu', d)
     do_split_packages(d, vpudir, '^vpu_fw_([^_]*).*\.bin',
                       output_pattern='firmware-imx-vpu-%s',
                       description='Freescale IMX Firmware %s',
                       extra_depends='',
                       prepend=True)
 
-    sdmadir = bb.data.expand('/lib/firmware/sdma', d)
+    sdmadir = bb.data.expand('${base_libdir}/firmware/sdma', d)
     do_split_packages(d, sdmadir, '^sdma-([^-]*).*\.bin',
                       output_pattern='firmware-imx-sdma-%s',
                       description='Freescale IMX Firmware %s',
@@ -46,6 +46,6 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-*"
 
 PACKAGES =+ "${PN}-epdc"
 
-FILES_${PN}-epdc = "/lib/firmware/imx/epdc/"
+FILES_${PN}-epdc = "${base_libdir}/firmware/imx/epdc/"
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-- 
cgit v1.2.3-54-g00ecf