summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmarnath Valluri <amarnath.valluri@intel.com>2017-01-04 13:58:24 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-16 18:05:12 +0000
commitc04a5673b6de5a324e9b827b36da20ce099f91f5 (patch)
tree2b695d8b2b30ac14c61aa1974359a5d05142c835
parent9c2158c0733cd4e6e44faa526d41cd07f6a00c25 (diff)
downloadpoky-c04a5673b6de5a324e9b827b36da20ce099f91f5.tar.gz
linux-firmware: Modify firmware installation path
Install firmware files under ${base_libdir}/firmware instead of hardcoded /lib/firmare. (From OE-Core rev: a46a23fed9acd097ecc8ab3985d18688abe7b065) Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb168
1 files changed, 86 insertions, 82 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 4fedcfbc67..5942997fda 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}${base_libdir}/firmware/
199 cp -r * ${D}/lib/firmware/ 199 cp -r * ${D}${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}${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}${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}${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}${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}${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}${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}${base_libdir}/firmware/
219} 219}
220 220
221 221
@@ -252,21 +252,21 @@ 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 = "${base_libdir}/firmware/LICENCE.atheros_firmware"
256FILES_${PN}-ar9170 = " \ 256FILES_${PN}-ar9170 = " \
257 /lib/firmware/ar9170*.fw \ 257 ${base_libdir}/firmware/ar9170*.fw \
258" 258"
259FILES_${PN}-carl9170 = " \ 259FILES_${PN}-carl9170 = " \
260 /lib/firmware/carl9170*.fw \ 260 ${base_libdir}/firmware/carl9170*.fw \
261" 261"
262FILES_${PN}-ath6k = " \ 262FILES_${PN}-ath6k = " \
263 /lib/firmware/ath6k \ 263 ${base_libdir}/firmware/ath6k \
264" 264"
265FILES_${PN}-ath9k = " \ 265FILES_${PN}-ath9k = " \
266 /lib/firmware/ar9271.fw \ 266 ${base_libdir}/firmware/ar9271.fw \
267 /lib/firmware/ar7010*.fw \ 267 ${base_libdir}/firmware/ar7010*.fw \
268 /lib/firmware/htc_9271.fw \ 268 ${base_libdir}/firmware/htc_9271.fw \
269 /lib/firmware/htc_7010.fw \ 269 ${base_libdir}/firmware/htc_7010.fw \
270" 270"
271 271
272RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license" 272RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license"
@@ -280,14 +280,14 @@ LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k"
280LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k" 280LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k"
281LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k" 281LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k"
282 282
283FILES_${PN}-ar3k-license = "/lib/firmware/LICENSE.QualcommAtheros_ar3k" 283FILES_${PN}-ar3k-license = "${base_libdir}/firmware/LICENSE.QualcommAtheros_ar3k"
284FILES_${PN}-ar3k = " \ 284FILES_${PN}-ar3k = " \
285 /lib/firmware/ar3k \ 285 ${base_libdir}/firmware/ar3k \
286" 286"
287 287
288FILES_${PN}-ath10k-license = "/lib/firmware/LICENSE.QualcommAtheros_ath10k" 288FILES_${PN}-ath10k-license = "${base_libdir}/firmware/LICENSE.QualcommAtheros_ath10k"
289FILES_${PN}-ath10k = " \ 289FILES_${PN}-ath10k = " \
290 /lib/firmware/ath10k \ 290 ${base_libdir}/firmware/ath10k \
291" 291"
292 292
293RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license" 293RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license"
@@ -297,9 +297,9 @@ RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license"
297LICENSE_${PN}-ralink = "Firmware-ralink-firmware" 297LICENSE_${PN}-ralink = "Firmware-ralink-firmware"
298LICENSE_${PN}-ralink-license = "Firmware-ralink-firmware" 298LICENSE_${PN}-ralink-license = "Firmware-ralink-firmware"
299 299
300FILES_${PN}-ralink-license = "/lib/firmware/LICENCE.ralink-firmware.txt" 300FILES_${PN}-ralink-license = "${base_libdir}/firmware/LICENCE.ralink-firmware.txt"
301FILES_${PN}-ralink = " \ 301FILES_${PN}-ralink = " \
302 /lib/firmware/rt*.bin \ 302 ${base_libdir}/firmware/rt*.bin \
303" 303"
304 304
305RDEPENDS_${PN}-ralink += "${PN}-ralink-license" 305RDEPENDS_${PN}-ralink += "${PN}-ralink-license"
@@ -308,9 +308,9 @@ RDEPENDS_${PN}-ralink += "${PN}-ralink-license"
308LICENSE_${PN}-radeon = "Firmware-radeon" 308LICENSE_${PN}-radeon = "Firmware-radeon"
309LICENSE_${PN}-radeon-license = "Firmware-radeon" 309LICENSE_${PN}-radeon-license = "Firmware-radeon"
310 310
311FILES_${PN}-radeon-license = "/lib/firmware/LICENSE.radeon" 311FILES_${PN}-radeon-license = "${base_libdir}/firmware/LICENSE.radeon"
312FILES_${PN}-radeon = " \ 312FILES_${PN}-radeon = " \
313 /lib/firmware/radeon \ 313 ${base_libdir}/firmware/radeon \
314" 314"
315 315
316RDEPENDS_${PN}-radeon += "${PN}-radeon-license" 316RDEPENDS_${PN}-radeon += "${PN}-radeon-license"
@@ -322,20 +322,20 @@ LICENSE_${PN}-sd8787 = "Firmware-Marvell"
322LICENSE_${PN}-sd8797 = "Firmware-Marvell" 322LICENSE_${PN}-sd8797 = "Firmware-Marvell"
323LICENSE_${PN}-marvell-license = "Firmware-Marvell" 323LICENSE_${PN}-marvell-license = "Firmware-Marvell"
324 324
325FILES_${PN}-marvell-license = "/lib/firmware/LICENCE.Marvell" 325FILES_${PN}-marvell-license = "${base_libdir}/firmware/LICENCE.Marvell"
326FILES_${PN}-sd8686 = " \ 326FILES_${PN}-sd8686 = " \
327 /lib/firmware/libertas/sd8686_v9* \ 327 ${base_libdir}/firmware/libertas/sd8686_v9* \
328 /lib/firmware/sd8686* \ 328 ${base_libdir}/firmware/sd8686* \
329" 329"
330FILES_${PN}-sd8688 = " \ 330FILES_${PN}-sd8688 = " \
331 /lib/firmware/libertas/sd8688* \ 331 ${base_libdir}/firmware/libertas/sd8688* \
332 /lib/firmware/mrvl/sd8688* \ 332 ${base_libdir}/firmware/mrvl/sd8688* \
333" 333"
334FILES_${PN}-sd8787 = " \ 334FILES_${PN}-sd8787 = " \
335 /lib/firmware/mrvl/sd8787_uapsta.bin \ 335 ${base_libdir}/firmware/mrvl/sd8787_uapsta.bin \
336" 336"
337FILES_${PN}-sd8797 = " \ 337FILES_${PN}-sd8797 = " \
338 /lib/firmware/mrvl/sd8797_uapsta.bin \ 338 ${base_libdir}/firmware/mrvl/sd8797_uapsta.bin \
339" 339"
340 340
341RDEPENDS_${PN}-sd8686 += "${PN}-marvell-license" 341RDEPENDS_${PN}-sd8686 += "${PN}-marvell-license"
@@ -353,25 +353,25 @@ LICENSE_${PN}-rtl8821 = "Firmware-rtlwifi_firmware"
353LICENSE_${PN}-rtl-license = "Firmware-rtlwifi_firmware" 353LICENSE_${PN}-rtl-license = "Firmware-rtlwifi_firmware"
354 354
355FILES_${PN}-rtl-license = " \ 355FILES_${PN}-rtl-license = " \
356 /lib/firmware/LICENCE.rtlwifi_firmware.txt \ 356 ${base_libdir}/firmware/LICENCE.rtlwifi_firmware.txt \
357" 357"
358FILES_${PN}-rtl8188 = " \ 358FILES_${PN}-rtl8188 = " \
359 /lib/firmware/rtlwifi/rtl8188*.bin \ 359 ${base_libdir}/firmware/rtlwifi/rtl8188*.bin \
360" 360"
361FILES_${PN}-rtl8192cu = " \ 361FILES_${PN}-rtl8192cu = " \
362 /lib/firmware/rtlwifi/rtl8192cufw*.bin \ 362 ${base_libdir}/firmware/rtlwifi/rtl8192cufw*.bin \
363" 363"
364FILES_${PN}-rtl8192ce = " \ 364FILES_${PN}-rtl8192ce = " \
365 /lib/firmware/rtlwifi/rtl8192cfw*.bin \ 365 ${base_libdir}/firmware/rtlwifi/rtl8192cfw*.bin \
366" 366"
367FILES_${PN}-rtl8192su = " \ 367FILES_${PN}-rtl8192su = " \
368 /lib/firmware/rtlwifi/rtl8712u.bin \ 368 ${base_libdir}/firmware/rtlwifi/rtl8712u.bin \
369" 369"
370FILES_${PN}-rtl8723 = " \ 370FILES_${PN}-rtl8723 = " \
371 /lib/firmware/rtlwifi/rtl8723*.bin \ 371 ${base_libdir}/firmware/rtlwifi/rtl8723*.bin \
372" 372"
373FILES_${PN}-rtl8821 = " \ 373FILES_${PN}-rtl8821 = " \
374 /lib/firmware/rtlwifi/rtl8821*.bin \ 374 ${base_libdir}/firmware/rtlwifi/rtl8821*.bin \
375" 375"
376 376
377RDEPENDS_${PN}-rtl8188 += "${PN}-rtl-license" 377RDEPENDS_${PN}-rtl8188 += "${PN}-rtl-license"
@@ -386,16 +386,16 @@ LICENSE_${PN}-wl12xx = "Firmware-ti-connectivity"
386LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity" 386LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity"
387LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity" 387LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity"
388 388
389FILES_${PN}-ti-connectivity-license = "/lib/firmware/LICENCE.ti-connectivity" 389FILES_${PN}-ti-connectivity-license = "${base_libdir}/firmware/LICENCE.ti-connectivity"
390FILES_${PN}-wl12xx = " \ 390FILES_${PN}-wl12xx = " \
391 /lib/firmware/wl12* \ 391 ${base_libdir}/firmware/wl12* \
392 /lib/firmware/TI* \ 392 ${base_libdir}/firmware/TI* \
393 /lib/firmware/ti-connectivity \ 393 ${base_libdir}/firmware/ti-connectivity \
394" 394"
395FILES_${PN}-wl18xx = " \ 395FILES_${PN}-wl18xx = " \
396 /lib/firmware/wl18* \ 396 ${base_libdir}/firmware/wl18* \
397 /lib/firmware/TI* \ 397 ${base_libdir}/firmware/TI* \
398 /lib/firmware/ti-connectivity \ 398 ${base_libdir}/firmware/ti-connectivity \
399" 399"
400 400
401RDEPENDS_${PN}-wl12xx = "${PN}-ti-connectivity-license" 401RDEPENDS_${PN}-wl12xx = "${PN}-ti-connectivity-license"
@@ -405,14 +405,18 @@ RDEPENDS_${PN}-wl18xx = "${PN}-ti-connectivity-license"
405LICENSE_${PN}-vt6656 = "Firmware-via_vt6656" 405LICENSE_${PN}-vt6656 = "Firmware-via_vt6656"
406LICENSE_${PN}-vt6656-license = "Firmware-via_vt6656" 406LICENSE_${PN}-vt6656-license = "Firmware-via_vt6656"
407 407
408FILES_${PN}-vt6656-license = "/lib/firmware/LICENCE.via_vt6656" 408FILES_${PN}-vt6656-license = "${base_libdir}/firmware/LICENCE.via_vt6656"
409FILES_${PN}-vt6656 = " \ 409FILES_${PN}-vt6656 = " \
410 /lib/firmware/vntwusb.fw \ 410 ${base_libdir}/firmware/vntwusb.fw \
411" 411"
412 412
413RDEPENDS_${PN}-vt6656 = "${PN}-vt6656-license" 413RDEPENDS_${PN}-vt6656 = "${PN}-vt6656-license"
414 414
415# For broadcom 415# For broadcom
416#
417# WARNING: The ALTERNATIVE_* variables are not using ${PN} because of
418# a bug in bitbake; when this is fixed and bitbake learns how to proper
419# pass variable flags with expansion we can rework this patch.
416 420
417LICENSE_${PN}-bcm4329 = "Firmware-broadcom_bcm43xx" 421LICENSE_${PN}-bcm4329 = "Firmware-broadcom_bcm43xx"
418LICENSE_${PN}-bcm4330 = "Firmware-broadcom_bcm43xx" 422LICENSE_${PN}-bcm4330 = "Firmware-broadcom_bcm43xx"
@@ -424,28 +428,28 @@ LICENSE_${PN}-bcm4354 = "Firmware-broadcom_bcm43xx"
424LICENSE_${PN}-broadcom-license = "Firmware-broadcom_bcm43xx" 428LICENSE_${PN}-broadcom-license = "Firmware-broadcom_bcm43xx"
425 429
426FILES_${PN}-broadcom-license = " \ 430FILES_${PN}-broadcom-license = " \
427 /lib/firmware/LICENCE.broadcom_bcm43xx \ 431 ${base_libdir}/firmware/LICENCE.broadcom_bcm43xx \
428" 432"
429FILES_${PN}-bcm4329 = " \ 433FILES_${PN}-bcm4329 = " \
430 /lib/firmware/brcm/brcmfmac4329-sdio.bin \ 434 ${base_libdir}/firmware/brcm/brcmfmac4329-sdio.bin \
431" 435"
432FILES_${PN}-bcm4330 = " \ 436FILES_${PN}-bcm4330 = " \
433 /lib/firmware/brcm/brcmfmac4330-sdio.bin \ 437 ${base_libdir}/firmware/brcm/brcmfmac4330-sdio.bin \
434" 438"
435FILES_${PN}-bcm4334 = " \ 439FILES_${PN}-bcm4334 = " \
436 /lib/firmware/brcm/brcmfmac4334-sdio.bin \ 440 ${base_libdir}/firmware/brcm/brcmfmac4334-sdio.bin \
437" 441"
438FILES_${PN}-bcm43340 = " \ 442FILES_${PN}-bcm43340 = " \
439 /lib/firmware/brcm/brcmfmac43340-sdio.bin \ 443 ${base_libdir}/firmware/brcm/brcmfmac43340-sdio.bin \
440" 444"
441FILES_${PN}-bcm4339 = " \ 445FILES_${PN}-bcm4339 = " \
442 /lib/firmware/brcm/brcmfmac4339-sdio.bin \ 446 ${base_libdir}/firmware/brcm/brcmfmac4339-sdio.bin \
443" 447"
444FILES_${PN}-bcm43430 = " \ 448FILES_${PN}-bcm43430 = " \
445 /lib/firmware/brcm/brcmfmac43430-sdio.bin \ 449 ${base_libdir}/firmware/brcm/brcmfmac43430-sdio.bin \
446" 450"
447FILES_${PN}-bcm4354 = " \ 451FILES_${PN}-bcm4354 = " \
448 /lib/firmware/brcm/brcmfmac4354-sdio.bin \ 452 ${base_libdir}/firmware/brcm/brcmfmac4354-sdio.bin \
449" 453"
450 454
451RDEPENDS_${PN}-bcm4329 += "${PN}-broadcom-license" 455RDEPENDS_${PN}-bcm4329 += "${PN}-broadcom-license"
@@ -464,8 +468,8 @@ RDEPENDS_${PN}-bcm4354 += "${PN}-broadcom-license"
464LICENSE_${PN}-bnx2-mips = "WHENCE" 468LICENSE_${PN}-bnx2-mips = "WHENCE"
465LICENSE_${PN}-whence-license = "WHENCE" 469LICENSE_${PN}-whence-license = "WHENCE"
466 470
467FILES_${PN}-bnx2-mips = "/lib/firmware/bnx2/bnx2-mips-09-6.2.1b.fw" 471FILES_${PN}-bnx2-mips = "${base_libdir}/firmware/bnx2/bnx2-mips-09-6.2.1b.fw"
468FILES_${PN}-whence-license = "/lib/firmware/WHENCE" 472FILES_${PN}-whence-license = "${base_libdir}/firmware/WHENCE"
469 473
470RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license" 474RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license"
471 475
@@ -491,24 +495,24 @@ LICENSE_${PN}-iwlwifi-misc = "Firmware-iwlwifi_firmware"
491LICENSE_${PN}-iwlwifi-license = "Firmware-iwlwifi_firmware" 495LICENSE_${PN}-iwlwifi-license = "Firmware-iwlwifi_firmware"
492 496
493 497
494FILES_${PN}-iwlwifi-license = "/lib/firmware/LICENCE.iwlwifi_firmware" 498FILES_${PN}-iwlwifi-license = "${base_libdir}/firmware/LICENCE.iwlwifi_firmware"
495FILES_${PN}-iwlwifi-135-6 = "/lib/firmware/iwlwifi-135-6.ucode" 499FILES_${PN}-iwlwifi-135-6 = "${base_libdir}/firmware/iwlwifi-135-6.ucode"
496FILES_${PN}-iwlwifi-3160-7 = "/lib/firmware/iwlwifi-3160-7.ucode" 500FILES_${PN}-iwlwifi-3160-7 = "${base_libdir}/firmware/iwlwifi-3160-7.ucode"
497FILES_${PN}-iwlwifi-3160-8 = "/lib/firmware/iwlwifi-3160-8.ucode" 501FILES_${PN}-iwlwifi-3160-8 = "${base_libdir}/firmware/iwlwifi-3160-8.ucode"
498FILES_${PN}-iwlwifi-3160-9 = "/lib/firmware/iwlwifi-3160-9.ucode" 502FILES_${PN}-iwlwifi-3160-9 = "${base_libdir}/firmware/iwlwifi-3160-9.ucode"
499FILES_${PN}-iwlwifi-6000-4 = "/lib/firmware/iwlwifi-6000-4.ucode" 503FILES_${PN}-iwlwifi-6000-4 = "${base_libdir}/firmware/iwlwifi-6000-4.ucode"
500FILES_${PN}-iwlwifi-6000g2a-5 = "/lib/firmware/iwlwifi-6000g2a-5.ucode" 504FILES_${PN}-iwlwifi-6000g2a-5 = "${base_libdir}/firmware/iwlwifi-6000g2a-5.ucode"
501FILES_${PN}-iwlwifi-6000g2a-6 = "/lib/firmware/iwlwifi-6000g2a-6.ucode" 505FILES_${PN}-iwlwifi-6000g2a-6 = "${base_libdir}/firmware/iwlwifi-6000g2a-6.ucode"
502FILES_${PN}-iwlwifi-6000g2b-5 = "/lib/firmware/iwlwifi-6000g2b-5.ucode" 506FILES_${PN}-iwlwifi-6000g2b-5 = "${base_libdir}/firmware/iwlwifi-6000g2b-5.ucode"
503FILES_${PN}-iwlwifi-6000g2b-6 = "/lib/firmware/iwlwifi-6000g2b-6.ucode" 507FILES_${PN}-iwlwifi-6000g2b-6 = "${base_libdir}/firmware/iwlwifi-6000g2b-6.ucode"
504FILES_${PN}-iwlwifi-6050-4 = "/lib/firmware/iwlwifi-6050-4.ucode" 508FILES_${PN}-iwlwifi-6050-4 = "${base_libdir}/firmware/iwlwifi-6050-4.ucode"
505FILES_${PN}-iwlwifi-6050-5 = "/lib/firmware/iwlwifi-6050-5.ucode" 509FILES_${PN}-iwlwifi-6050-5 = "${base_libdir}/firmware/iwlwifi-6050-5.ucode"
506FILES_${PN}-iwlwifi-7260 = "/lib/firmware/iwlwifi-7260-*.ucode" 510FILES_${PN}-iwlwifi-7260 = "${base_libdir}/firmware/iwlwifi-7260-*.ucode"
507FILES_${PN}-iwlwifi-7265 = "/lib/firmware/iwlwifi-7265-*.ucode" 511FILES_${PN}-iwlwifi-7265 = "${base_libdir}/firmware/iwlwifi-7265-*.ucode"
508FILES_${PN}-iwlwifi-7265d = "/lib/firmware/iwlwifi-7265D-*.ucode" 512FILES_${PN}-iwlwifi-7265d = "${base_libdir}/firmware/iwlwifi-7265D-*.ucode"
509FILES_${PN}-iwlwifi-8000c = "/lib/firmware/iwlwifi-8000C-*.ucode" 513FILES_${PN}-iwlwifi-8000c = "${base_libdir}/firmware/iwlwifi-8000C-*.ucode"
510FILES_${PN}-iwlwifi-8265 = "/lib/firmware/iwlwifi-8265-*.ucode" 514FILES_${PN}-iwlwifi-8265 = "${base_libdir}/firmware/iwlwifi-8265-*.ucode"
511FILES_${PN}-iwlwifi-misc = "/lib/firmware/iwlwifi-*.ucode" 515FILES_${PN}-iwlwifi-misc = "${base_libdir}/firmware/iwlwifi-*.ucode"
512 516
513RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license" 517RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license"
514RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license" 518RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license"
@@ -547,14 +551,14 @@ RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}
547 551
548LICENSE_${PN}-i915 = "Firmware-i915" 552LICENSE_${PN}-i915 = "Firmware-i915"
549LICENSE_${PN}-i915-license = "Firmware-i915" 553LICENSE_${PN}-i915-license = "Firmware-i915"
550FILES_${PN}-i915-license = "/lib/firmware/LICENSE.i915" 554FILES_${PN}-i915-license = "${base_libdir}/firmware/LICENSE.i915"
551FILES_${PN}-i915 = "/lib/firmware/i915" 555FILES_${PN}-i915 = "${base_libdir}/firmware/i915"
552RDEPENDS_${PN}-i915 = "${PN}-i915-license" 556RDEPENDS_${PN}-i915 = "${PN}-i915-license"
553 557
554FILES_${PN}-adsp-sst-license = "/lib/firmware/LICENCE.adsp_sst" 558FILES_${PN}-adsp-sst-license = "${base_libdir}/firmware/LICENCE.adsp_sst"
555LICENSE_${PN}-adsp-sst = "Firmware-adsp_sst" 559LICENSE_${PN}-adsp-sst = "Firmware-adsp_sst"
556LICENSE_${PN}-adsp-sst-license = "Firmware-adsp_sst" 560LICENSE_${PN}-adsp-sst-license = "Firmware-adsp_sst"
557FILES_${PN}-adsp-sst = "/lib/firmware/intel/dsp_fw*" 561FILES_${PN}-adsp-sst = "${base_libdir}/firmware/intel/dsp_fw*"
558RDEPENDS_${PN}-adsp-sst = "${PN}-adsp-sst-license" 562RDEPENDS_${PN}-adsp-sst = "${PN}-adsp-sst-license"
559 563
560# For other firmwares 564# For other firmwares
@@ -606,8 +610,8 @@ LICENSE_${PN} = "\
606 & WHENCE \ 610 & WHENCE \
607" 611"
608 612
609FILES_${PN}-license += "/lib/firmware/LICEN*" 613FILES_${PN}-license += "${base_libdir}/firmware/LICEN*"
610FILES_${PN} += "/lib/firmware/*" 614FILES_${PN} += "${base_libdir}/firmware/*"
611RDEPENDS_${PN} += "${PN}-license" 615RDEPENDS_${PN} += "${PN}-license"
612RDEPENDS_${PN} += "${PN}-whence-license" 616RDEPENDS_${PN} += "${PN}-whence-license"
613 617