summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2016-09-16 14:37:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-20 15:11:07 +0100
commit77a9472a4b4ff2daa9171eaae9ee10f1f8527a0d (patch)
tree99962b6f94d1d5a0f8bb44f8d7294a7bc4f407c3 /meta/recipes-kernel
parent49a7839e602eac2c43415d9c8f17ad8315fd1da5 (diff)
downloadpoky-77a9472a4b4ff2daa9171eaae9ee10f1f8527a0d.tar.gz
linux-firmware: Correct the LICENSE setting of license packages
This change causes the licenses of the linux-firmware-*-license to be the license that it contains instead of all the licenses of the linux-firmware package. [YOCTO #10251] (From OE-Core rev: 3b1423df3369e7239d1969b42e090278df8bbff2) Signed-off-by: Saul Wold <sgw@linux.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.bb12
1 files changed, 12 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index ed0c6ecdba..e10750cbdf 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -250,6 +250,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
250LICENSE_${PN}-ar9170 = "Firmware-atheros_firmware" 250LICENSE_${PN}-ar9170 = "Firmware-atheros_firmware"
251LICENSE_${PN}-ath6k = "Firmware-atheros_firmware" 251LICENSE_${PN}-ath6k = "Firmware-atheros_firmware"
252LICENSE_${PN}-ath9k = "Firmware-atheros_firmware" 252LICENSE_${PN}-ath9k = "Firmware-atheros_firmware"
253LICENSE_${PN}-atheros-license = "Firmware-atheros_firmware"
253 254
254FILES_${PN}-atheros-license = "/lib/firmware/LICENCE.atheros_firmware" 255FILES_${PN}-atheros-license = "/lib/firmware/LICENCE.atheros_firmware"
255FILES_${PN}-ar9170 = " \ 256FILES_${PN}-ar9170 = " \
@@ -271,7 +272,9 @@ RDEPENDS_${PN}-ath9k += "${PN}-atheros-license"
271 272
272# For QualCommAthos 273# For QualCommAthos
273LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k" 274LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k"
275LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k"
274LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k" 276LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k"
277LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k"
275 278
276FILES_${PN}-ar3k-license = "/lib/firmware/LICENSE.QualcommAtheros_ar3k" 279FILES_${PN}-ar3k-license = "/lib/firmware/LICENSE.QualcommAtheros_ar3k"
277FILES_${PN}-ar3k = " \ 280FILES_${PN}-ar3k = " \
@@ -288,6 +291,7 @@ RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license"
288 291
289# For ralink 292# For ralink
290LICENSE_${PN}-ralink = "Firmware-ralink-firmware" 293LICENSE_${PN}-ralink = "Firmware-ralink-firmware"
294LICENSE_${PN}-ralink-license = "Firmware-ralink-firmware"
291 295
292FILES_${PN}-ralink-license = "/lib/firmware/LICENCE.ralink-firmware.txt" 296FILES_${PN}-ralink-license = "/lib/firmware/LICENCE.ralink-firmware.txt"
293FILES_${PN}-ralink = " \ 297FILES_${PN}-ralink = " \
@@ -298,6 +302,7 @@ RDEPENDS_${PN}-ralink += "${PN}-ralink-license"
298 302
299# For radeon 303# For radeon
300LICENSE_${PN}-radeon = "Firmware-radeon" 304LICENSE_${PN}-radeon = "Firmware-radeon"
305LICENSE_${PN}-radeon-license = "Firmware-radeon"
301 306
302FILES_${PN}-radeon-license = "/lib/firmware/LICENSE.radeon" 307FILES_${PN}-radeon-license = "/lib/firmware/LICENSE.radeon"
303FILES_${PN}-radeon = " \ 308FILES_${PN}-radeon = " \
@@ -311,6 +316,7 @@ LICENSE_${PN}-sd8686 = "Firmware-Marvell"
311LICENSE_${PN}-sd8688 = "Firmware-Marvell" 316LICENSE_${PN}-sd8688 = "Firmware-Marvell"
312LICENSE_${PN}-sd8787 = "Firmware-Marvell" 317LICENSE_${PN}-sd8787 = "Firmware-Marvell"
313LICENSE_${PN}-sd8797 = "Firmware-Marvell" 318LICENSE_${PN}-sd8797 = "Firmware-Marvell"
319LICENSE_${PN}-marvell-license = "Firmware-Marvell"
314 320
315FILES_${PN}-marvell-license = "/lib/firmware/LICENCE.Marvell" 321FILES_${PN}-marvell-license = "/lib/firmware/LICENCE.Marvell"
316FILES_${PN}-sd8686 = " \ 322FILES_${PN}-sd8686 = " \
@@ -337,6 +343,7 @@ RDEPENDS_${PN}-sd8797 += "${PN}-marvell-license"
337LICENSE_${PN}-rtl8192cu = "Firmware-rtlwifi_firmware" 343LICENSE_${PN}-rtl8192cu = "Firmware-rtlwifi_firmware"
338LICENSE_${PN}-rtl8192ce = "Firmware-rtlwifi_firmware" 344LICENSE_${PN}-rtl8192ce = "Firmware-rtlwifi_firmware"
339LICENSE_${PN}-rtl8192su = "Firmware-rtlwifi_firmware" 345LICENSE_${PN}-rtl8192su = "Firmware-rtlwifi_firmware"
346LICENSE_${PN}-rtl-license = "Firmware-rtlwifi_firmware"
340 347
341FILES_${PN}-rtl-license = " \ 348FILES_${PN}-rtl-license = " \
342 /lib/firmware/LICENCE.rtlwifi_firmware.txt \ 349 /lib/firmware/LICENCE.rtlwifi_firmware.txt \
@@ -358,6 +365,7 @@ RDEPENDS_${PN}-rtl8192su = "${PN}-rtl-license"
358# For ti-connectivity 365# For ti-connectivity
359LICENSE_${PN}-wl12xx = "Firmware-ti-connectivity" 366LICENSE_${PN}-wl12xx = "Firmware-ti-connectivity"
360LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity" 367LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity"
368LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity"
361 369
362FILES_${PN}-ti-connectivity-license = "/lib/firmware/LICENCE.ti-connectivity" 370FILES_${PN}-ti-connectivity-license = "/lib/firmware/LICENCE.ti-connectivity"
363FILES_${PN}-wl12xx = " \ 371FILES_${PN}-wl12xx = " \
@@ -376,6 +384,7 @@ RDEPENDS_${PN}-wl18xx = "${PN}-ti-connectivity-license"
376 384
377# For vt6656 385# For vt6656
378LICENSE_${PN}-vt6656 = "Firmware-via_vt6656" 386LICENSE_${PN}-vt6656 = "Firmware-via_vt6656"
387LICENSE_${PN}-vt6656-license = "Firmware-via_vt6656"
379 388
380FILES_${PN}-vt6656-license = "/lib/firmware/LICENCE.via_vt6656" 389FILES_${PN}-vt6656-license = "/lib/firmware/LICENCE.via_vt6656"
381FILES_${PN}-vt6656 = " \ 390FILES_${PN}-vt6656 = " \
@@ -396,6 +405,7 @@ LICENSE_${PN}-bcm4334 = "Firmware-broadcom_bcm43xx"
396LICENSE_${PN}-bcm43340 = "Firmware-broadcom_bcm43xx" 405LICENSE_${PN}-bcm43340 = "Firmware-broadcom_bcm43xx"
397LICENSE_${PN}-bcm4339 = "Firmware-broadcom_bcm43xx" 406LICENSE_${PN}-bcm4339 = "Firmware-broadcom_bcm43xx"
398LICENSE_${PN}-bcm4354 = "Firmware-broadcom_bcm43xx" 407LICENSE_${PN}-bcm4354 = "Firmware-broadcom_bcm43xx"
408LICENSE_${PN}-broadcom-license = "Firmware-broadcom_bcm43xx"
399 409
400FILES_${PN}-broadcom-license = " \ 410FILES_${PN}-broadcom-license = " \
401 /lib/firmware/LICENCE.broadcom_bcm43xx \ 411 /lib/firmware/LICENCE.broadcom_bcm43xx \
@@ -532,12 +542,14 @@ RREPLACES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-
532RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" 542RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9"
533 543
534LICENSE_${PN}-i915 = "Firmware-i915" 544LICENSE_${PN}-i915 = "Firmware-i915"
545LICENSE_${PN}-i915-license = "Firmware-i915"
535FILES_${PN}-i915-license = "/lib/firmware/LICENSE.i915" 546FILES_${PN}-i915-license = "/lib/firmware/LICENSE.i915"
536FILES_${PN}-i915 = "/lib/firmware/i915" 547FILES_${PN}-i915 = "/lib/firmware/i915"
537RDEPENDS_${PN}-i915 = "${PN}-i915-license" 548RDEPENDS_${PN}-i915 = "${PN}-i915-license"
538 549
539FILES_${PN}-adsp-sst-license = "/lib/firmware/LICENCE.adsp_sst" 550FILES_${PN}-adsp-sst-license = "/lib/firmware/LICENCE.adsp_sst"
540LICENSE_${PN}-adsp-sst = "Firmware-adsp_sst" 551LICENSE_${PN}-adsp-sst = "Firmware-adsp_sst"
552LICENSE_${PN}-adsp-sst-license = "Firmware-adsp_sst"
541FILES_${PN}-adsp-sst = "/lib/firmware/intel/dsp_fw*" 553FILES_${PN}-adsp-sst = "/lib/firmware/intel/dsp_fw*"
542RDEPENDS_${PN}-adsp-sst = "${PN}-adsp-sst-license" 554RDEPENDS_${PN}-adsp-sst = "${PN}-adsp-sst-license"
543 555