summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorAmarnath Valluri <amarnath.valluri@intel.com>2017-02-08 11:06:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-22 11:35:20 +0000
commit8c13f318ae6e435934047d09c5cd4206f12256f1 (patch)
tree4fbdd662c0fa1538299c91fb758a4725ba1a0b99 /meta/recipes-kernel
parent0decf1cc1c35dd70f3b822e3b4291a810a319ba0 (diff)
downloadpoky-8c13f318ae6e435934047d09c5cd4206f12256f1.tar.gz
firmware: use ${nonarch_base_libdir} for firmware installation.
Replace hardcoded '/lib' in kernel firmware installation path with ${nonarch_base_libdir}. (From OE-Core rev: eebf0028f5cb30468fe5cd273a01b004a3936e21) Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb168
1 files changed, 84 insertions, 84 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 5547e160dc..5b5a7a41a5 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -195,27 +195,27 @@ do_compile() {
195} 195}
196 196
197do_install() { 197do_install() {
198 install -d ${D}/lib/firmware/ 198 install -d ${D}${nonarch_base_libdir}/firmware/
199 cp -r * ${D}/lib/firmware/ 199 cp -r * ${D}${nonarch_base_libdir}/firmware/
200 200
201 # Avoid Makefile to be deployed 201 # Avoid Makefile to be deployed
202 rm ${D}/lib/firmware/Makefile 202 rm ${D}${nonarch_base_libdir}/firmware/Makefile
203 203
204 # Remove unbuild firmware which needs cmake and bash 204 # Remove unbuild firmware which needs cmake and bash
205 rm ${D}/lib/firmware/carl9170fw -rf 205 rm ${D}${nonarch_base_libdir}/firmware/carl9170fw -rf
206 206
207 # Remove pointless bash script 207 # Remove pointless bash script
208 rm ${D}/lib/firmware/configure 208 rm ${D}${nonarch_base_libdir}/firmware/configure
209 209
210 # Libertas sd8686 210 # Libertas sd8686
211 ln -sf libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin 211 ln -sf libertas/sd8686_v9.bin ${D}${nonarch_base_libdir}/firmware/sd8686.bin
212 ln -sf libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin 212 ln -sf libertas/sd8686_v9_helper.bin ${D}${nonarch_base_libdir}/firmware/sd8686_helper.bin
213 213
214 # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it 214 # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it
215 ( cd ${D}/lib/firmware ; ln -sf ti-connectivity/* . ) 215 ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )
216 216
217 # Copy the iwlwifi ucode 217 # Copy the iwlwifi ucode
218 cp ${WORKDIR}/iwlwifi-8000C-19.ucode ${D}/lib/firmware/ 218 cp ${WORKDIR}/iwlwifi-8000C-19.ucode ${D}${nonarch_base_libdir}/firmware/
219} 219}
220 220
221 221
@@ -252,23 +252,23 @@ LICENSE_${PN}-ath6k = "Firmware-atheros_firmware"
252LICENSE_${PN}-ath9k = "Firmware-atheros_firmware" 252LICENSE_${PN}-ath9k = "Firmware-atheros_firmware"
253LICENSE_${PN}-atheros-license = "Firmware-atheros_firmware" 253LICENSE_${PN}-atheros-license = "Firmware-atheros_firmware"
254 254
255FILES_${PN}-atheros-license = "/lib/firmware/LICENCE.atheros_firmware" 255FILES_${PN}-atheros-license = "${nonarch_base_libdir}/firmware/LICENCE.atheros_firmware"
256FILES_${PN}-ar9170 = " \ 256FILES_${PN}-ar9170 = " \
257 /lib/firmware/ar9170*.fw \ 257 ${nonarch_base_libdir}/firmware/ar9170*.fw \
258" 258"
259FILES_${PN}-carl9170 = " \ 259FILES_${PN}-carl9170 = " \
260 /lib/firmware/carl9170*.fw \ 260 ${nonarch_base_libdir}/firmware/carl9170*.fw \
261" 261"
262FILES_${PN}-ath6k = " \ 262FILES_${PN}-ath6k = " \
263 /lib/firmware/ath6k \ 263 ${nonarch_base_libdir}/firmware/ath6k \
264" 264"
265FILES_${PN}-ath9k = " \ 265FILES_${PN}-ath9k = " \
266 /lib/firmware/ar9271.fw \ 266 ${nonarch_base_libdir}/firmware/ar9271.fw \
267 /lib/firmware/ar7010*.fw \ 267 ${nonarch_base_libdir}/firmware/ar7010*.fw \
268 /lib/firmware/htc_9271.fw \ 268 ${nonarch_base_libdir}/firmware/htc_9271.fw \
269 /lib/firmware/htc_7010.fw \ 269 ${nonarch_base_libdir}/firmware/htc_7010.fw \
270 /lib/firmware/ath9k_htc/htc_7010-1.4.0.fw \ 270 ${nonarch_base_libdir}/firmware/ath9k_htc/htc_7010-1.4.0.fw \
271 /lib/firmware/ath9k_htc/htc_9271-1.4.0.fw \ 271 ${nonarch_base_libdir}/firmware/ath9k_htc/htc_9271-1.4.0.fw \
272" 272"
273 273
274RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license" 274RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license"
@@ -282,14 +282,14 @@ LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k"
282LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k" 282LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k"
283LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k" 283LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k"
284 284
285FILES_${PN}-ar3k-license = "/lib/firmware/LICENSE.QualcommAtheros_ar3k" 285FILES_${PN}-ar3k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ar3k"
286FILES_${PN}-ar3k = " \ 286FILES_${PN}-ar3k = " \
287 /lib/firmware/ar3k \ 287 ${nonarch_base_libdir}/firmware/ar3k \
288" 288"
289 289
290FILES_${PN}-ath10k-license = "/lib/firmware/LICENSE.QualcommAtheros_ath10k" 290FILES_${PN}-ath10k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ath10k"
291FILES_${PN}-ath10k = " \ 291FILES_${PN}-ath10k = " \
292 /lib/firmware/ath10k \ 292 ${nonarch_base_libdir}/firmware/ath10k \
293" 293"
294 294
295RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license" 295RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license"
@@ -299,9 +299,9 @@ RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license"
299LICENSE_${PN}-ralink = "Firmware-ralink-firmware" 299LICENSE_${PN}-ralink = "Firmware-ralink-firmware"
300LICENSE_${PN}-ralink-license = "Firmware-ralink-firmware" 300LICENSE_${PN}-ralink-license = "Firmware-ralink-firmware"
301 301
302FILES_${PN}-ralink-license = "/lib/firmware/LICENCE.ralink-firmware.txt" 302FILES_${PN}-ralink-license = "${nonarch_base_libdir}/firmware/LICENCE.ralink-firmware.txt"
303FILES_${PN}-ralink = " \ 303FILES_${PN}-ralink = " \
304 /lib/firmware/rt*.bin \ 304 ${nonarch_base_libdir}/firmware/rt*.bin \
305" 305"
306 306
307RDEPENDS_${PN}-ralink += "${PN}-ralink-license" 307RDEPENDS_${PN}-ralink += "${PN}-ralink-license"
@@ -310,9 +310,9 @@ RDEPENDS_${PN}-ralink += "${PN}-ralink-license"
310LICENSE_${PN}-radeon = "Firmware-radeon" 310LICENSE_${PN}-radeon = "Firmware-radeon"
311LICENSE_${PN}-radeon-license = "Firmware-radeon" 311LICENSE_${PN}-radeon-license = "Firmware-radeon"
312 312
313FILES_${PN}-radeon-license = "/lib/firmware/LICENSE.radeon" 313FILES_${PN}-radeon-license = "${nonarch_base_libdir}/firmware/LICENSE.radeon"
314FILES_${PN}-radeon = " \ 314FILES_${PN}-radeon = " \
315 /lib/firmware/radeon \ 315 ${nonarch_base_libdir}/firmware/radeon \
316" 316"
317 317
318RDEPENDS_${PN}-radeon += "${PN}-radeon-license" 318RDEPENDS_${PN}-radeon += "${PN}-radeon-license"
@@ -327,20 +327,20 @@ LICENSE_${PN}-sd8887 = "Firmware-Marvell"
327LICENSE_${PN}-sd8897 = "Firmware-Marvell" 327LICENSE_${PN}-sd8897 = "Firmware-Marvell"
328LICENSE_${PN}-marvell-license = "Firmware-Marvell" 328LICENSE_${PN}-marvell-license = "Firmware-Marvell"
329 329
330FILES_${PN}-marvell-license = "/lib/firmware/LICENCE.Marvell" 330FILES_${PN}-marvell-license = "${nonarch_base_libdir}/firmware/LICENCE.Marvell"
331FILES_${PN}-sd8686 = " \ 331FILES_${PN}-sd8686 = " \
332 /lib/firmware/libertas/sd8686_v9* \ 332 ${nonarch_base_libdir}/firmware/libertas/sd8686_v9* \
333 /lib/firmware/sd8686* \ 333 ${nonarch_base_libdir}/firmware/sd8686* \
334" 334"
335FILES_${PN}-sd8688 = " \ 335FILES_${PN}-sd8688 = " \
336 /lib/firmware/libertas/sd8688* \ 336 ${nonarch_base_libdir}/firmware/libertas/sd8688* \
337 /lib/firmware/mrvl/sd8688* \ 337 ${nonarch_base_libdir}/firmware/mrvl/sd8688* \
338" 338"
339FILES_${PN}-sd8787 = " \ 339FILES_${PN}-sd8787 = " \
340 /lib/firmware/mrvl/sd8787_uapsta.bin \ 340 ${nonarch_base_libdir}/firmware/mrvl/sd8787_uapsta.bin \
341" 341"
342FILES_${PN}-sd8797 = " \ 342FILES_${PN}-sd8797 = " \
343 /lib/firmware/mrvl/sd8797_uapsta.bin \ 343 ${nonarch_base_libdir}/firmware/mrvl/sd8797_uapsta.bin \
344" 344"
345FILES_${PN}-sd8801 = " \ 345FILES_${PN}-sd8801 = " \
346 /lib/firmware/mrvl/sd8801_uapsta.bin \ 346 /lib/firmware/mrvl/sd8801_uapsta.bin \
@@ -370,25 +370,25 @@ LICENSE_${PN}-rtl8821 = "Firmware-rtlwifi_firmware"
370LICENSE_${PN}-rtl-license = "Firmware-rtlwifi_firmware" 370LICENSE_${PN}-rtl-license = "Firmware-rtlwifi_firmware"
371 371
372FILES_${PN}-rtl-license = " \ 372FILES_${PN}-rtl-license = " \
373 /lib/firmware/LICENCE.rtlwifi_firmware.txt \ 373 ${nonarch_base_libdir}/firmware/LICENCE.rtlwifi_firmware.txt \
374" 374"
375FILES_${PN}-rtl8188 = " \ 375FILES_${PN}-rtl8188 = " \
376 /lib/firmware/rtlwifi/rtl8188*.bin \ 376 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8188*.bin \
377" 377"
378FILES_${PN}-rtl8192cu = " \ 378FILES_${PN}-rtl8192cu = " \
379 /lib/firmware/rtlwifi/rtl8192cufw*.bin \ 379 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8192cufw*.bin \
380" 380"
381FILES_${PN}-rtl8192ce = " \ 381FILES_${PN}-rtl8192ce = " \
382 /lib/firmware/rtlwifi/rtl8192cfw*.bin \ 382 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8192cfw*.bin \
383" 383"
384FILES_${PN}-rtl8192su = " \ 384FILES_${PN}-rtl8192su = " \
385 /lib/firmware/rtlwifi/rtl8712u.bin \ 385 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8712u.bin \
386" 386"
387FILES_${PN}-rtl8723 = " \ 387FILES_${PN}-rtl8723 = " \
388 /lib/firmware/rtlwifi/rtl8723*.bin \ 388 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8723*.bin \
389" 389"
390FILES_${PN}-rtl8821 = " \ 390FILES_${PN}-rtl8821 = " \
391 /lib/firmware/rtlwifi/rtl8821*.bin \ 391 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8821*.bin \
392" 392"
393 393
394RDEPENDS_${PN}-rtl8188 += "${PN}-rtl-license" 394RDEPENDS_${PN}-rtl8188 += "${PN}-rtl-license"
@@ -403,16 +403,16 @@ LICENSE_${PN}-wl12xx = "Firmware-ti-connectivity"
403LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity" 403LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity"
404LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity" 404LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity"
405 405
406FILES_${PN}-ti-connectivity-license = "/lib/firmware/LICENCE.ti-connectivity" 406FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity"
407FILES_${PN}-wl12xx = " \ 407FILES_${PN}-wl12xx = " \
408 /lib/firmware/wl12* \ 408 ${nonarch_base_libdir}/firmware/wl12* \
409 /lib/firmware/TI* \ 409 ${nonarch_base_libdir}/firmware/TI* \
410 /lib/firmware/ti-connectivity \ 410 ${nonarch_base_libdir}/firmware/ti-connectivity \
411" 411"
412FILES_${PN}-wl18xx = " \ 412FILES_${PN}-wl18xx = " \
413 /lib/firmware/wl18* \ 413 ${nonarch_base_libdir}/firmware/wl18* \
414 /lib/firmware/TI* \ 414 ${nonarch_base_libdir}/firmware/TI* \
415 /lib/firmware/ti-connectivity \ 415 ${nonarch_base_libdir}/firmware/ti-connectivity \
416" 416"
417 417
418RDEPENDS_${PN}-wl12xx = "${PN}-ti-connectivity-license" 418RDEPENDS_${PN}-wl12xx = "${PN}-ti-connectivity-license"
@@ -422,9 +422,9 @@ RDEPENDS_${PN}-wl18xx = "${PN}-ti-connectivity-license"
422LICENSE_${PN}-vt6656 = "Firmware-via_vt6656" 422LICENSE_${PN}-vt6656 = "Firmware-via_vt6656"
423LICENSE_${PN}-vt6656-license = "Firmware-via_vt6656" 423LICENSE_${PN}-vt6656-license = "Firmware-via_vt6656"
424 424
425FILES_${PN}-vt6656-license = "/lib/firmware/LICENCE.via_vt6656" 425FILES_${PN}-vt6656-license = "${nonarch_base_libdir}/firmware/LICENCE.via_vt6656"
426FILES_${PN}-vt6656 = " \ 426FILES_${PN}-vt6656 = " \
427 /lib/firmware/vntwusb.fw \ 427 ${nonarch_base_libdir}/firmware/vntwusb.fw \
428" 428"
429 429
430RDEPENDS_${PN}-vt6656 = "${PN}-vt6656-license" 430RDEPENDS_${PN}-vt6656 = "${PN}-vt6656-license"
@@ -441,28 +441,28 @@ LICENSE_${PN}-bcm4354 = "Firmware-broadcom_bcm43xx"
441LICENSE_${PN}-broadcom-license = "Firmware-broadcom_bcm43xx" 441LICENSE_${PN}-broadcom-license = "Firmware-broadcom_bcm43xx"
442 442
443FILES_${PN}-broadcom-license = " \ 443FILES_${PN}-broadcom-license = " \
444 /lib/firmware/LICENCE.broadcom_bcm43xx \ 444 ${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx \
445" 445"
446FILES_${PN}-bcm4329 = " \ 446FILES_${PN}-bcm4329 = " \
447 /lib/firmware/brcm/brcmfmac4329-sdio.bin \ 447 ${nonarch_base_libdir}/firmware/brcm/brcmfmac4329-sdio.bin \
448" 448"
449FILES_${PN}-bcm4330 = " \ 449FILES_${PN}-bcm4330 = " \
450 /lib/firmware/brcm/brcmfmac4330-sdio.bin \ 450 ${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.bin \
451" 451"
452FILES_${PN}-bcm4334 = " \ 452FILES_${PN}-bcm4334 = " \
453 /lib/firmware/brcm/brcmfmac4334-sdio.bin \ 453 ${nonarch_base_libdir}/firmware/brcm/brcmfmac4334-sdio.bin \
454" 454"
455FILES_${PN}-bcm43340 = " \ 455FILES_${PN}-bcm43340 = " \
456 /lib/firmware/brcm/brcmfmac43340-sdio.bin \ 456 ${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.bin \
457" 457"
458FILES_${PN}-bcm4339 = " \ 458FILES_${PN}-bcm4339 = " \
459 /lib/firmware/brcm/brcmfmac4339-sdio.bin \ 459 ${nonarch_base_libdir}/firmware/brcm/brcmfmac4339-sdio.bin \
460" 460"
461FILES_${PN}-bcm43430 = " \ 461FILES_${PN}-bcm43430 = " \
462 /lib/firmware/brcm/brcmfmac43430-sdio.bin \ 462 ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.bin \
463" 463"
464FILES_${PN}-bcm4354 = " \ 464FILES_${PN}-bcm4354 = " \
465 /lib/firmware/brcm/brcmfmac4354-sdio.bin \ 465 ${nonarch_base_libdir}/firmware/brcm/brcmfmac4354-sdio.bin \
466" 466"
467 467
468RDEPENDS_${PN}-bcm4329 += "${PN}-broadcom-license" 468RDEPENDS_${PN}-bcm4329 += "${PN}-broadcom-license"
@@ -481,8 +481,8 @@ RDEPENDS_${PN}-bcm4354 += "${PN}-broadcom-license"
481LICENSE_${PN}-bnx2-mips = "WHENCE" 481LICENSE_${PN}-bnx2-mips = "WHENCE"
482LICENSE_${PN}-whence-license = "WHENCE" 482LICENSE_${PN}-whence-license = "WHENCE"
483 483
484FILES_${PN}-bnx2-mips = "/lib/firmware/bnx2/bnx2-mips-09-6.2.1b.fw" 484FILES_${PN}-bnx2-mips = "${nonarch_base_libdir}/firmware/bnx2/bnx2-mips-09-6.2.1b.fw"
485FILES_${PN}-whence-license = "/lib/firmware/WHENCE" 485FILES_${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE"
486 486
487RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license" 487RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license"
488 488
@@ -508,24 +508,24 @@ LICENSE_${PN}-iwlwifi-misc = "Firmware-iwlwifi_firmware"
508LICENSE_${PN}-iwlwifi-license = "Firmware-iwlwifi_firmware" 508LICENSE_${PN}-iwlwifi-license = "Firmware-iwlwifi_firmware"
509 509
510 510
511FILES_${PN}-iwlwifi-license = "/lib/firmware/LICENCE.iwlwifi_firmware" 511FILES_${PN}-iwlwifi-license = "${nonarch_base_libdir}/firmware/LICENCE.iwlwifi_firmware"
512FILES_${PN}-iwlwifi-135-6 = "/lib/firmware/iwlwifi-135-6.ucode" 512FILES_${PN}-iwlwifi-135-6 = "${nonarch_base_libdir}/firmware/iwlwifi-135-6.ucode"
513FILES_${PN}-iwlwifi-3160-7 = "/lib/firmware/iwlwifi-3160-7.ucode" 513FILES_${PN}-iwlwifi-3160-7 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-7.ucode"
514FILES_${PN}-iwlwifi-3160-8 = "/lib/firmware/iwlwifi-3160-8.ucode" 514FILES_${PN}-iwlwifi-3160-8 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-8.ucode"
515FILES_${PN}-iwlwifi-3160-9 = "/lib/firmware/iwlwifi-3160-9.ucode" 515FILES_${PN}-iwlwifi-3160-9 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-9.ucode"
516FILES_${PN}-iwlwifi-6000-4 = "/lib/firmware/iwlwifi-6000-4.ucode" 516FILES_${PN}-iwlwifi-6000-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6000-4.ucode"
517FILES_${PN}-iwlwifi-6000g2a-5 = "/lib/firmware/iwlwifi-6000g2a-5.ucode" 517FILES_${PN}-iwlwifi-6000g2a-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-5.ucode"
518FILES_${PN}-iwlwifi-6000g2a-6 = "/lib/firmware/iwlwifi-6000g2a-6.ucode" 518FILES_${PN}-iwlwifi-6000g2a-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-6.ucode"
519FILES_${PN}-iwlwifi-6000g2b-5 = "/lib/firmware/iwlwifi-6000g2b-5.ucode" 519FILES_${PN}-iwlwifi-6000g2b-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-5.ucode"
520FILES_${PN}-iwlwifi-6000g2b-6 = "/lib/firmware/iwlwifi-6000g2b-6.ucode" 520FILES_${PN}-iwlwifi-6000g2b-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-6.ucode"
521FILES_${PN}-iwlwifi-6050-4 = "/lib/firmware/iwlwifi-6050-4.ucode" 521FILES_${PN}-iwlwifi-6050-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-4.ucode"
522FILES_${PN}-iwlwifi-6050-5 = "/lib/firmware/iwlwifi-6050-5.ucode" 522FILES_${PN}-iwlwifi-6050-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-5.ucode"
523FILES_${PN}-iwlwifi-7260 = "/lib/firmware/iwlwifi-7260-*.ucode" 523FILES_${PN}-iwlwifi-7260 = "${nonarch_base_libdir}/firmware/iwlwifi-7260-*.ucode"
524FILES_${PN}-iwlwifi-7265 = "/lib/firmware/iwlwifi-7265-*.ucode" 524FILES_${PN}-iwlwifi-7265 = "${nonarch_base_libdir}/firmware/iwlwifi-7265-*.ucode"
525FILES_${PN}-iwlwifi-7265d = "/lib/firmware/iwlwifi-7265D-*.ucode" 525FILES_${PN}-iwlwifi-7265d = "${nonarch_base_libdir}/firmware/iwlwifi-7265D-*.ucode"
526FILES_${PN}-iwlwifi-8000c = "/lib/firmware/iwlwifi-8000C-*.ucode" 526FILES_${PN}-iwlwifi-8000c = "${nonarch_base_libdir}/firmware/iwlwifi-8000C-*.ucode"
527FILES_${PN}-iwlwifi-8265 = "/lib/firmware/iwlwifi-8265-*.ucode" 527FILES_${PN}-iwlwifi-8265 = "${nonarch_base_libdir}/firmware/iwlwifi-8265-*.ucode"
528FILES_${PN}-iwlwifi-misc = "/lib/firmware/iwlwifi-*.ucode" 528FILES_${PN}-iwlwifi-misc = "${nonarch_base_libdir}/firmware/iwlwifi-*.ucode"
529 529
530RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license" 530RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license"
531RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license" 531RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license"
@@ -564,14 +564,14 @@ RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}
564 564
565LICENSE_${PN}-i915 = "Firmware-i915" 565LICENSE_${PN}-i915 = "Firmware-i915"
566LICENSE_${PN}-i915-license = "Firmware-i915" 566LICENSE_${PN}-i915-license = "Firmware-i915"
567FILES_${PN}-i915-license = "/lib/firmware/LICENSE.i915" 567FILES_${PN}-i915-license = "${nonarch_base_libdir}/firmware/LICENSE.i915"
568FILES_${PN}-i915 = "/lib/firmware/i915" 568FILES_${PN}-i915 = "${nonarch_base_libdir}/firmware/i915"
569RDEPENDS_${PN}-i915 = "${PN}-i915-license" 569RDEPENDS_${PN}-i915 = "${PN}-i915-license"
570 570
571FILES_${PN}-adsp-sst-license = "/lib/firmware/LICENCE.adsp_sst" 571FILES_${PN}-adsp-sst-license = "${nonarch_base_libdir}/firmware/LICENCE.adsp_sst"
572LICENSE_${PN}-adsp-sst = "Firmware-adsp_sst" 572LICENSE_${PN}-adsp-sst = "Firmware-adsp_sst"
573LICENSE_${PN}-adsp-sst-license = "Firmware-adsp_sst" 573LICENSE_${PN}-adsp-sst-license = "Firmware-adsp_sst"
574FILES_${PN}-adsp-sst = "/lib/firmware/intel/dsp_fw*" 574FILES_${PN}-adsp-sst = "${nonarch_base_libdir}/firmware/intel/dsp_fw*"
575RDEPENDS_${PN}-adsp-sst = "${PN}-adsp-sst-license" 575RDEPENDS_${PN}-adsp-sst = "${PN}-adsp-sst-license"
576 576
577# For other firmwares 577# For other firmwares
@@ -623,8 +623,8 @@ LICENSE_${PN} = "\
623 & WHENCE \ 623 & WHENCE \
624" 624"
625 625
626FILES_${PN}-license += "/lib/firmware/LICEN*" 626FILES_${PN}-license += "${nonarch_base_libdir}/firmware/LICEN*"
627FILES_${PN} += "/lib/firmware/*" 627FILES_${PN} += "${nonarch_base_libdir}/firmware/*"
628RDEPENDS_${PN} += "${PN}-license" 628RDEPENDS_${PN} += "${PN}-license"
629RDEPENDS_${PN} += "${PN}-whence-license" 629RDEPENDS_${PN} += "${PN}-whence-license"
630 630