summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNg, Wei Tee <wei.tee.ng@intel.com>2017-04-09 18:58:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-14 09:47:08 +0100
commit9a5039d563f46e4b8c55238576ccf0d02ef8d154 (patch)
treed160b431c08a3a2d7ad2be4d63860a2c90254e86
parenta6ace3153e43e7971719400107345b08e07c75ae (diff)
downloadpoky-9a5039d563f46e4b8c55238576ccf0d02ef8d154.tar.gz
linux-firmware: Set the license for carl9170 to GPLv2
linux-firmwara-carl9170 was set to a wrong license string. Carl9170 firmware is bounded by GPLv2 via code inspection on linux firmware source tree. Hence we include GPLv2 in LICENSE field and set carl9170 firmware to the correct license. [YOCTO #11090] (From OE-Core rev: a062b2aa51e28aa14e75435d8a618859499e1bd5) Signed-off-by: Ng, Wei Tee <wei.tee.ng@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb21
1 files changed, 16 insertions, 5 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index be82a633f2..7b43c25dba 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -19,6 +19,7 @@ LICENSE = "\
19 & Firmware-ene_firmware \ 19 & Firmware-ene_firmware \
20 & Firmware-fw_sst_0f28 \ 20 & Firmware-fw_sst_0f28 \
21 & Firmware-go7007 \ 21 & Firmware-go7007 \
22 & Firmware-GPLv2 \
22 & Firmware-hfi1_firmware \ 23 & Firmware-hfi1_firmware \
23 & Firmware-i2400m \ 24 & Firmware-i2400m \
24 & Firmware-i915 \ 25 & Firmware-i915 \
@@ -75,6 +76,7 @@ LIC_FILES_CHKSUM = "\
75 file://LICENCE.ene_firmware;md5=ed67f0f62f8f798130c296720b7d3921 \ 76 file://LICENCE.ene_firmware;md5=ed67f0f62f8f798130c296720b7d3921 \
76 file://LICENCE.fw_sst_0f28;md5=6353931c988ad52818ae733ac61cd293 \ 77 file://LICENCE.fw_sst_0f28;md5=6353931c988ad52818ae733ac61cd293 \
77 file://LICENCE.go7007;md5=c0bb9f6aaaba55b0529ee9b30aa66beb \ 78 file://LICENCE.go7007;md5=c0bb9f6aaaba55b0529ee9b30aa66beb \
79 file://GPL-2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
78 file://LICENSE.hfi1_firmware;md5=5e7b6e586ce7339d12689e49931ad444 \ 80 file://LICENSE.hfi1_firmware;md5=5e7b6e586ce7339d12689e49931ad444 \
79 file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ 81 file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \
80 file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ 82 file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \
@@ -132,6 +134,7 @@ NO_GENERIC_LICENSE[Firmware-e100] = "LICENCE.e100"
132NO_GENERIC_LICENSE[Firmware-ene_firmware] = "LICENCE.ene_firmware" 134NO_GENERIC_LICENSE[Firmware-ene_firmware] = "LICENCE.ene_firmware"
133NO_GENERIC_LICENSE[Firmware-fw_sst_0f28] = "LICENCE.fw_sst_0f28" 135NO_GENERIC_LICENSE[Firmware-fw_sst_0f28] = "LICENCE.fw_sst_0f28"
134NO_GENERIC_LICENSE[Firmware-go7007] = "LICENCE.go7007" 136NO_GENERIC_LICENSE[Firmware-go7007] = "LICENCE.go7007"
137NO_GENERIC_LICENSE[Firmware-GPLv2] = "GPL-2"
135NO_GENERIC_LICENSE[Firmware-hfi1_firmware] = "LICENSE.hfi1_firmware" 138NO_GENERIC_LICENSE[Firmware-hfi1_firmware] = "LICENSE.hfi1_firmware"
136NO_GENERIC_LICENSE[Firmware-i2400m] = "LICENCE.i2400m" 139NO_GENERIC_LICENSE[Firmware-i2400m] = "LICENCE.i2400m"
137NO_GENERIC_LICENSE[Firmware-i915] = "LICENSE.i915" 140NO_GENERIC_LICENSE[Firmware-i915] = "LICENSE.i915"
@@ -223,7 +226,8 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
223 ${PN}-vt6656-license ${PN}-vt6656 \ 226 ${PN}-vt6656-license ${PN}-vt6656 \
224 ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \ 227 ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \
225 ${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 ${PN}-bcm43340 ${PN}-bcm4339 ${PN}-bcm43430 ${PN}-bcm4354 \ 228 ${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 ${PN}-bcm43340 ${PN}-bcm4339 ${PN}-bcm43430 ${PN}-bcm4354 \
226 ${PN}-atheros-license ${PN}-ar9170 ${PN}-carl9170 ${PN}-ath6k ${PN}-ath9k \ 229 ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \
230 ${PN}-gplv2-license ${PN}-carl9170 \
227 ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k \ 231 ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k \
228 \ 232 \
229 ${PN}-iwlwifi-license ${PN}-iwlwifi \ 233 ${PN}-iwlwifi-license ${PN}-iwlwifi \
@@ -253,9 +257,6 @@ FILES_${PN}-atheros-license = "${nonarch_base_libdir}/firmware/LICENCE.atheros_f
253FILES_${PN}-ar9170 = " \ 257FILES_${PN}-ar9170 = " \
254 ${nonarch_base_libdir}/firmware/ar9170*.fw \ 258 ${nonarch_base_libdir}/firmware/ar9170*.fw \
255" 259"
256FILES_${PN}-carl9170 = " \
257 ${nonarch_base_libdir}/firmware/carl9170*.fw \
258"
259FILES_${PN}-ath6k = " \ 260FILES_${PN}-ath6k = " \
260 ${nonarch_base_libdir}/firmware/ath6k \ 261 ${nonarch_base_libdir}/firmware/ath6k \
261" 262"
@@ -269,10 +270,20 @@ FILES_${PN}-ath9k = " \
269" 270"
270 271
271RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license" 272RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license"
272RDEPENDS_${PN}-carl9170 += "${PN}-atheros-license"
273RDEPENDS_${PN}-ath6k += "${PN}-atheros-license" 273RDEPENDS_${PN}-ath6k += "${PN}-atheros-license"
274RDEPENDS_${PN}-ath9k += "${PN}-atheros-license" 274RDEPENDS_${PN}-ath9k += "${PN}-atheros-license"
275 275
276# For carl9170
277LICENSE_${PN}-carl9170 = "Firmware-GPLv2"
278LICENSE_${PN}-gplv2-license = "Firmware-GPLv2"
279
280FILES_${PN}-gplv2-license = "${nonarch_base_libdir}/firmware/GPL-2"
281FILES_${PN}-carl9170 = " \
282 ${nonarch_base_libdir}/firmware/carl9170*.fw \
283"
284
285RDEPENDS_${PN}-carl9170 += "${PN}-gplv2-license"
286
276# For QualCommAthos 287# For QualCommAthos
277LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k" 288LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k"
278LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" 289LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k"