Skip to contentSkip to conversation

linux-firmware: Fix usrmerge builds

PATCH New Alex Kiernan 1 participant 1 message Mar 6, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux-firmware: Fix usrmerge builds

FIRMWAREDIR defaults to /lib, failing when usrmerge is enabled:

ERROR: linux-firmware-1_20200122-r0 do_install: Execution of '/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/linux-firmware/1_20200122-r0/temp/run.do_install.31218' failed with exit code 1:
mkdir -p /home/akiernan/poky/build/tmp/work/core2-64-poky-linux/linux-firmware/1_20200122-r0/image/lib/firmware
./copy-firmware.sh /home/akiernan/poky/build/tmp/work/core2-64-poky-linux/linux-firmware/1_20200122-r0/image/lib/firmware
cp: target '/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/linux-firmware/1_20200122-r0/image/usr/lib/firmware/' is not a directory

---

 meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +1 -1
index 6039dc9d711f..8f963f4f4224 100644
@@ -208,7 +208,7 @@ do_compile() {
 }
 
 do_install() {
-        oe_runmake 'DESTDIR=${D}' install
+        oe_runmake 'DESTDIR=${D}' 'FIRMWAREDIR=${nonarch_base_libdir}/firmware' install
         cp GPL-2 LICEN[CS]E.* WHENCE ${D}${nonarch_base_libdir}/firmware/
 }
 
Signature · 1 line
2.17.1