linux-firware_%.bbappend: multiple fixes

Fix yocto project compatibility issue: was using raw _appends, without a
machineoverride.

Fix not pinning to a specific commit ID. The firmware could be updated,
which would change the hash and break the build temporarily.

Fix naming. There are several similarly named firmware blobs (e.g.,
iwlwifi-8265-31) so not using the real name of the blob was confusing.

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/common/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/common/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index 50836ee1..f6968af8 100644
--- a/common/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/common/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -10,12 +10,14 @@
 # Note: keep these in sync when updating the iwlwifi_git.bb LinuxCore
 # versions.
 
-SRC_URI_append = " https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git/plain/iwlwifi-8000C-31.ucode;name=iwlwifi-8260-31"
+SRC_URI_append_intel-x86-common = " https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git/plain/iwlwifi-8000C-31.ucode?id=${IWLWIFI_SRCREV};name=iwlwifi-8000C-31"
 
-SRC_URI[iwlwifi-8260-31.md5sum] = "428a84a780bbe864a7af6a6734c4b529"
-SRC_URI[iwlwifi-8260-31.sha256sum] = "5a337c52f9d7a7cb5cb0a13c93232f4de742ed0debef757d68231bdb55455406"
+IWLWIFI_SRCREV = "942f14f65363f33c3fd8a06db58c8ccca0559335"
 
-do_install_append() {
+SRC_URI[iwlwifi-8000C-31.md5sum] = "428a84a780bbe864a7af6a6734c4b529"
+SRC_URI[iwlwifi-8000C-31.sha256sum] = "5a337c52f9d7a7cb5cb0a13c93232f4de742ed0debef757d68231bdb55455406"
+
+do_install_append_intel-x86-common() {
     # Copy the iwlwifi/LinuxCore required ucode for Intel Wireless 8260
-    cp ${WORKDIR}/iwlwifi-8000C-31.ucode ${D}/${nonarch_base_libdir}/firmware/
+    cp ${WORKDIR}/iwlwifi-8000C-31.ucode\?id\=${IWLWIFI_SRCREV} ${D}/${nonarch_base_libdir}/firmware/iwlwifi-8000C-31.ucode
 }