[yocto] linux-firmware: build failure

[Craig McQueen]

I'm trying upgrading to rocko (from morty).

I'm getting a build failure for linux-firmware:


DEBUG: Executing python function extend_recipe_sysroot
NOTE: Direct dependencies are ['virtual:native:/home/craigm/yocto/poky/build/../meta/recipes-devtools/pseudo/pseudo_1.8.2.bb:do_populate_sysroot', '/home/craigm/yocto/poky/build/../meta/recipes-devtools/quilt/quilt-native_0.65.bb:do_populate_sysroot']
NOTE: Installed into sysroot: ['pseudo-native']
NOTE: Skipping as already exists in sysroot: ['quilt-native']
DEBUG: Python function extend_recipe_sysroot finished
DEBUG: Executing shell function do_install
rm: cannot remove '/home/craigm/yocto/poky/build/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+80d463be82-r0/image/lib/firmware/check_whence.py': No such file or directory
WARNING: exit code 1 from a shell command.
ERROR: Function failed: do_install (log file is located at /home/craigm/yocto/poky/build/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+80d463be82-r0/temp/log.do_install.120558)


It seems that the latest git doesn't contain check_whence.py... or something like that. But I'm puzzled as to why the previous committer (17a772775c2559897e49236ae352444065e1b1ff perhaps) would not have encountered this.

Would the following be a suitable fix? --


diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 0338ba8ac2..b8f2865e3b 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -215,7 +215,7 @@ do_install() {
        rm ${D}${nonarch_base_libdir}/firmware/configure
 
        # Remove python script used to check the WHENCE file
-       rm ${D}${nonarch_base_libdir}/firmware/check_whence.py
+       rm ${D}${nonarch_base_libdir}/firmware/check_whence.py -rf
 
        # Libertas sd8686
        ln -sf libertas/sd8686_v9.bin ${D}${nonarch_base_libdir}/firmware/sd8686.bin


-- 
Craig McQueen