[meta-raspberrypi][PATCH] linux-firmware: Rework of brcmfmac43430 firmware handling

[meta-raspberrypi][PATCH] linux-firmware: Rework of brcmfmac43430 firmware handling

[toolmmy]

The current version of the recipe produces the following warnings while createing an image:

WARNING: The license listed Firmware-broadcom_brcm80211 was not in the licenses collected for recipe linux-firmwa
re
WARNING: [log_check] td-core-image: found a warning message in the logfile (keyword 'WARNING:'):
[log_check] WARNING: The license listed Firmware-broadcom_brcm80211 was not in the licenses collected for recipe
linux-firmware

This commit contains a rework of the brcm80211 firmware handling and deploys the firmware and the LICENSE files that fixes the warning messages.

Signed-off-by: Tom Doehring <toolmmy@gmail.com>
---
 .../linux-firmware/linux-firmware_git.bbappend       | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
index f0c9fe2..20ef05f 100644
--- a/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
+++ b/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
@@ -1,6 +1,10 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-LIC_FILES_CHKSUM_append = "file://${WORKDIR}/LICENSE.broadcom_brcm80211;md5=8cba1397cda6386db37210439a0da3eb"
+LICENSE_append = " & Firmware-broadcom_brcm80211"
+
+LIC_FILES_CHKSUM_append = " file://${WORKDIR}/LICENSE.broadcom_brcm80211;md5=8cba1397cda6386db37210439a0da3eb"
+
+NO_GENERIC_LICENSE[Firmware-broadcom_brcm80211] = "LICENSE.broadcom_brcm80211"
 
 SRC_URI_append = " \
     file://brcmfmac43430-sdio.bin \
@@ -9,21 +13,21 @@ SRC_URI_append = " \
     "
 
 do_install_append() {
-    cp ${WORKDIR}/brcmfmac43430-sdio.* ${D}/lib/firmware/brcm
+    cp ${WORKDIR}/brcmfmac43430-sdio.* ${D}/lib/firmware/brcm/
+    cp ${WORKDIR}/LICENSE.broadcom_brcm80211 ${D}/lib/firmware/
 }
 
-PACKAGES =+ "${PN}-brcm43430"
+PACKAGES =+ "${PN}-brcm43430 ${PN}-brcm43430-license"
+
+LICENSE_${PN}-brcm43430 = "Firmware-broadcom_brcm80211"
+FILES_${PN}-brcm43430-license = "/lib/firmware/LICENSE.broadcom_brcm80211"
 FILES_${PN}-brcm43430 = " \
     /lib/firmware/brcm/brcmfmac43430-sdio.bin \
     /lib/firmware/brcm/brcmfmac43430-sdio.txt \
     "
 
-LICENSE_append = " & Firmware-broadcom_brcm80211"
-NO_GENERIC_LICENSE[Firmware-broadcom_brcm80211] = "LICENCE.broadcom_brcm80211"
-LICENSE_${PN}-brcm43430 = "LICENSE.broadcom_brcm80211"
+RDEPENDS_${PN}-brcm43430 += "${PN}-brcm43430-license"
 
 ALTERNATIVE_LINK_NAME[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac-sdio.bin"
 ALTERNATIVE_TARGET_linux-firmware-brcm43430[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac43430-sdio.bin"
 ALTERNATIVE_linux-firmware-brcm43430 = "brcmfmac-sdio.bin"
-
-RDEPENDPS_${PN}-brcm43430 += "${PN}-broadcom-license"

Re: [meta-raspberrypi][PATCH] linux-firmware: Rework of brcmfmac43430 firmware handling

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 3147 bytes --]

On Sat, Apr 09, 2016 at 12:48:03PM +0200, toolmmy wrote:
> The current version of the recipe produces the following warnings while createing an image:
>
> WARNING: The license listed Firmware-broadcom_brcm80211 was not in the licenses collected for recipe linux-firmwa
> re
> WARNING: [log_check] td-core-image: found a warning message in the logfile (keyword 'WARNING:'):
> [log_check] WARNING: The license listed Firmware-broadcom_brcm80211 was not in the licenses collected for recipe
> linux-firmware
>
> This commit contains a rework of the brcm80211 firmware handling and deploys the firmware and the LICENSE files that fixes the warning messages.
>
> Signed-off-by: Tom Doehring <toolmmy@gmail.com>
> ---
>  .../linux-firmware/linux-firmware_git.bbappend       | 20 ++++++++++++--------
>  1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
> index f0c9fe2..20ef05f 100644
> --- a/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
> +++ b/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
> @@ -1,6 +1,10 @@
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>
> -LIC_FILES_CHKSUM_append = "file://${WORKDIR}/LICENSE.broadcom_brcm80211;md5=8cba1397cda6386db37210439a0da3eb"
> +LICENSE_append = " & Firmware-broadcom_brcm80211"
> +
> +LIC_FILES_CHKSUM_append = " file://${WORKDIR}/LICENSE.broadcom_brcm80211;md5=8cba1397cda6386db37210439a0da3eb"
> +
> +NO_GENERIC_LICENSE[Firmware-broadcom_brcm80211] = "LICENSE.broadcom_brcm80211"
>
>  SRC_URI_append = " \
>      file://brcmfmac43430-sdio.bin \
> @@ -9,21 +13,21 @@ SRC_URI_append = " \
>      "
>
>  do_install_append() {
> -    cp ${WORKDIR}/brcmfmac43430-sdio.* ${D}/lib/firmware/brcm
> +    cp ${WORKDIR}/brcmfmac43430-sdio.* ${D}/lib/firmware/brcm/
> +    cp ${WORKDIR}/LICENSE.broadcom_brcm80211 ${D}/lib/firmware/
>  }
>
> -PACKAGES =+ "${PN}-brcm43430"
> +PACKAGES =+ "${PN}-brcm43430 ${PN}-brcm43430-license"
> +
> +LICENSE_${PN}-brcm43430 = "Firmware-broadcom_brcm80211"
> +FILES_${PN}-brcm43430-license = "/lib/firmware/LICENSE.broadcom_brcm80211"
>  FILES_${PN}-brcm43430 = " \
>      /lib/firmware/brcm/brcmfmac43430-sdio.bin \
>      /lib/firmware/brcm/brcmfmac43430-sdio.txt \
>      "
>
> -LICENSE_append = " & Firmware-broadcom_brcm80211"
> -NO_GENERIC_LICENSE[Firmware-broadcom_brcm80211] = "LICENCE.broadcom_brcm80211"
> -LICENSE_${PN}-brcm43430 = "LICENSE.broadcom_brcm80211"
> +RDEPENDS_${PN}-brcm43430 += "${PN}-brcm43430-license"
>
>  ALTERNATIVE_LINK_NAME[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac-sdio.bin"
>  ALTERNATIVE_TARGET_linux-firmware-brcm43430[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac43430-sdio.bin"
>  ALTERNATIVE_linux-firmware-brcm43430 = "brcmfmac-sdio.bin"
> -
> -RDEPENDPS_${PN}-brcm43430 += "${PN}-broadcom-license"
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

Merged to master. Thanks.

--
Andrei Gherzan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]