diff options
| author |   Alex Kiernan <alex.kiernan@gmail.com> | 2020-03-06 14:35:18 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-07 10:04:43 +0000 |
| commit | e51b82b05678a2602afce0ad892d84125620cf73 (patch) | |
| tree | 9d2b355ac861e00863d667c4b1e7238ee3cf2bfe /meta/recipes-kernel/linux-firmware | |
| parent | 09c4f9068858bf59eb60584a497f987bdd1e196e (diff) | |
| download | openembedded-core-e51b82b05678a2602afce0ad892d84125620cf73.tar.gz | |
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@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux-firmware')
| -rw-r--r-- | meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 6039dc9d71..8f963f4f42 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/ } |