Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firmware-atheros/firmware-qualcomm: remove hardcoded /lib in FILES paths 

Our do_install() places all firmware files inside of the path in the
{base_libdir} variable, but we were hardcoding /lib in FILES. This is an issue
when using the usrmerge distro feature, because {base_libdir} becomes /usr/lib
instead of /lib. This was causing these recipes to fail.

Fix this by using {base_libdir} in FILES so that it matches do_install().

https://onedigi.atlassian.net/browse/DEL-9011

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2024-05-21 18:32:39 +02:00
parent f6d91b9022
commit eca9ddc1d9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
View File

@ -1,4 +1,4 @@
# Copyright (C) 2013-2017, Digi International Inc.
# Copyright (C) 2013-2024, Digi International Inc.
SUMMARY = "Firmware files for Digi's platforms, such as Atheros bluetooth."
SECTION = "base"
@ -91,8 +91,8 @@ pkg_postinst_ontarget:${PN}-ath6kl() {
# Do not create empty debug and development packages (PN-dbg PN-dev PN-staticdev)
PACKAGES = "${PN}-ar3k ${PN}-ath6kl"
FILES:${PN}-ar3k = "/lib/firmware/ar3k"
FILES:${PN}-ath6kl = "/lib/firmware/ath6k"
FILES:${PN}-ar3k = "${base_libdir}/firmware/ar3k"
FILES:${PN}-ath6kl = "${base_libdir}/firmware/ath6k"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(ccimx6sbc)"

6
meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
View File

@ -1,4 +1,4 @@
# Copyright (C) 2016-2023, Digi International Inc.
# Copyright (C) 2016-2024, Digi International Inc.
SUMMARY = "Qualcomm firmware files for Digi's platforms."
SECTION = "base"
@ -144,8 +144,8 @@ QCA_MODEL:ccimx8x = "qca6574"
# Do not create empty debug and development packages (PN-dbg PN-dev PN-staticdev)
PACKAGES = "${PN}-${QCA_MODEL}-bt ${PN}-${QCA_MODEL}-wifi"
FILES:${PN}-${QCA_MODEL}-bt = "/lib/firmware/qca"
FILES:${PN}-${QCA_MODEL}-wifi = "/lib/firmware"
FILES:${PN}-${QCA_MODEL}-bt = "${base_libdir}/firmware/qca"
FILES:${PN}-${QCA_MODEL}-wifi = "${base_libdir}/firmware"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x)"