summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2024-09-05 14:18:20 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2024-09-06 05:24:28 +0000
commitdc0d7c85ffa353b4cb7758ab3f79b152542ac3e7 (patch)
tree1b0fcd1193fe55afc30853105e957c1232173f61
parent415af2f115a3d9e4db475b29493afceba41795ca (diff)
linux-firmware: remove conflicting file for j784s4-evm
After latest meta-ti layer update j784s4-evm QBSP creation fails with: "Package linux-firmware-cnm wants to install file /home/qt/work/build/tmp/work/j784s4_evm-poky-linux/b2qt-embedded-qt6-image/1.0/rootfs/usr/lib/firmware/cnm/wave521c_k3_codec_fw.bin But that file is already provided by package * cnm-wave-fw" Remove the conflicting file. Task-number: QTBUG-128597 Change-Id: I2513fc7952bf1f617f5aa25427f1b10b2254bba2 Reviewed-by: Alex Bu <alex.bu@qt.io>
-rw-r--r--recipes-kernel/linux-firmware/linux-firmware_%.bbappend2
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index 4dc9113..0f3fca8 100644
--- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -29,6 +29,8 @@
# Firmware conflict with cadence-mhdp-fw so need to choose one,
# bins are identical for now so can use either.
+# Second firmware conflict with cnm-wave-fw, remove conflicting file.
do_install:append:j784s4-evm() {
rm -f ${D}${base_libdir}/firmware/cadence/mhdp8546.bin
+ rm -f ${D}${base_libdir}/firmware/cnm/wave521c_k3_codec_fw.bin
}