[oe-commits] [openembedded-core] 11/13: linux-firmware: Fix usrmerge builds
git at git.openembedded.org
git at git.openembedded.org
Fri Mar 6 17:14:57 UTC 2020
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit d4db8353e630cde83116b647024eca153818df7e
Author: Alex Kiernan <alex.kiernan at gmail.com>
AuthorDate: Fri Mar 6 14:35:18 2020 +0000
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
Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb
index 6039dc9..8f963f4 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb
@@ -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/
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list