From b3fe56eec075ccd719b0ec1fde32ad9c37f0cca0 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 9 Oct 2018 16:57:18 +0200 Subject: linux-firmware: use nonarch_base_libdir When building with usrmerge, the firmware directory is in /usr/lib. Make sure we pickup firmwares from nonarch_base_libdir. This fixes a build warning when building Torizon: * Problem 1/1: * - nothing provides linux-firmware-rtl8188eu needed by linux-firmware-1:0.0+git0+d114732723-r0.all Signed-off-by: Stefan Agner Acked-by: Max Krummenacher --- recipes-kernel/linux-firmware/linux-firmware_%.bbappend | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index 6f2958f..161e8ee 100644 --- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -12,14 +12,14 @@ PACKAGES_prepend = "\ ${PN}-sd8997 \ " do_install_append() { - cp ${WORKDIR}/sd8997_uapsta.bin ${D}/lib/firmware/mrvl/ + cp ${WORKDIR}/sd8997_uapsta.bin ${D}${nonarch_base_libdir}/firmware/mrvl/ } FILES_${PN}-rtl8188eu = " \ - /lib/firmware/rtlwifi/rtl8188eufw.bin \ + ${nonarch_base_libdir}/firmware/rtlwifi/rtl8188eufw.bin \ " FILES_${PN}-sd8997 = " \ - /lib/firmware/mrvl/sd8997_uapsta.bin \ + ${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin \ " RDEPENDS_${PN}-rtl8188eu += "${PN}-rtl-license" RDEPENDS_${PN}-sd8997 += "${PN}-marvell-license" -- cgit v1.2.3