aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Salveti <ricardo@opensourcefoundries.com>2018-02-07 15:39:40 -0200
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2018-02-08 12:06:59 +0100
commit11831af103a00abde02ac65ad3ab5cc672088522 (patch)
treee912237bda84c6d204e7c4423421638645567a73
parenta026183ffd437dbb1ac675e602541314948f7650 (diff)
downloadmeta-qcom-11831af103a00abde02ac65ad3ab5cc672088522.zip
meta-qcom-11831af103a00abde02ac65ad3ab5cc672088522.tar.gz
meta-qcom-11831af103a00abde02ac65ad3ab5cc672088522.tar.bz2
firmware-qcom: use nonarch_base_libdir instead of /lib
Hardcoded /lib is not compatible with usrmerge. Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com> (cherry picked from commit df97f9e7b28a29305e4036064328ad027dc57c58)
-rw-r--r--recipes-bsp/firmware/firmware-qcom-dragonboard410c_1032.1.bb14
-rw-r--r--recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb12
2 files changed, 13 insertions, 13 deletions
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard410c_1032.1.bb b/recipes-bsp/firmware/firmware-qcom-dragonboard410c_1032.1.bb
index c3a7b8d..15f4e31 100644
--- a/recipes-bsp/firmware/firmware-qcom-dragonboard410c_1032.1.bb
+++ b/recipes-bsp/firmware/firmware-qcom-dragonboard410c_1032.1.bb
@@ -19,23 +19,23 @@ do_compile() {
}
do_install() {
- install -d ${D}/lib/firmware/
- cp -r ./proprietary-linux/* ${D}/lib/firmware/
+ install -d ${D}${nonarch_base_libdir}/firmware/
+ cp -r ./proprietary-linux/* ${D}${nonarch_base_libdir}/firmware/
MTOOLS_SKIP_CHECK=1 mcopy -i ./bootloaders-linux/NON-HLOS.bin \
- ::image/modem.* ::image/mba.mbn ::image/wcnss.* ${D}/lib/firmware/
+ ::image/modem.* ::image/mba.mbn ::image/wcnss.* ${D}${nonarch_base_libdir}/firmware/
# Venus firmware have been merged in linux-firmware in a different location than
# what we've been using for now. Let's add symlinks for now, until we switch to linux-firmware
- install -d ${D}/lib/firmware/qcom/venus-1.8/
- for f in ${D}/lib/firmware/venus.*; do
+ install -d ${D}${nonarch_base_libdir}/firmware/qcom/venus-1.8/
+ for f in ${D}${nonarch_base_libdir}/firmware/venus.*; do
f=$(basename $f)
- ln -s /lib/firmware/$f ${D}/lib/firmware/qcom/venus-1.8/$f
+ ln -s ${nonarch_base_libdir}/firmware/$f ${D}${nonarch_base_libdir}/firmware/qcom/venus-1.8/$f
done
install -d ${D}${sysconfdir}/
install -m 0644 LICENSE ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE
}
-FILES_${PN} += "/lib/firmware/*"
+FILES_${PN} += "${nonarch_base_libdir}/firmware/*"
INSANE_SKIP_${PN} += "arch"
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb b/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb
index 8eac349..541f6f1 100644
--- a/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb
+++ b/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb
@@ -17,16 +17,16 @@ do_compile() {
}
do_install() {
- install -d ${D}/lib/firmware/
- install -d ${D}/lib/firmware/qcom/venus-4.2/
+ install -d ${D}${nonarch_base_libdir}/firmware/
+ install -d ${D}${nonarch_base_libdir}/firmware/qcom/venus-4.2/
- install -m 0444 ./proprietary-linux/a530*.* ${D}/lib/firmware/
- install -m 0444 ./proprietary-linux/venus.* ${D}/lib/firmware/qcom/venus-4.2/
- install -m 0444 ./proprietary-linux/adsp.* ${D}/lib/firmware/
+ install -m 0444 ./proprietary-linux/a530*.* ${D}${nonarch_base_libdir}/firmware/
+ install -m 0444 ./proprietary-linux/venus.* ${D}${nonarch_base_libdir}/firmware/qcom/venus-4.2/
+ install -m 0444 ./proprietary-linux/adsp.* ${D}${nonarch_base_libdir}/firmware/
install -d ${D}${sysconfdir}/
install -m 0644 LICENSE ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE
}
-FILES_${PN} += "/lib/firmware/*"
+FILES_${PN} += "${nonarch_base_libdir}/firmware/*"
INSANE_SKIP_${PN} += "arch"