[oe-commits] Peter A. Bigot : linux-firmware: correct name of Marvell license file

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next-1.6
Commit: 2dbbaeb9154b6d1f68ccb1dcbf3d96f5b2156e82
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2dbbaeb9154b6d1f68ccb1dcbf3d96f5b2156e82

Author: Peter A. Bigot <pab at pabigot.com>
Date:   Mon Aug 26 16:49:28 2013 -0500

linux-firmware: correct name of Marvell license file

Follow upstream in changing the name of the license file for Marvell
firmware:

  commit 2e79e60b7e4771427327ed508fa27b90d841afcb
  Author: Bing Zhao <bzhao at marvell.com>
  Date:   Fri Jan 7 16:06:56 2011 -0800

    linux-firmware: use single license file for Marvell firmwares

    Libertas and mwl8k firmware images are under the same license.

    Signed-off-by: Bing Zhao <bzhao at marvell.com>
    Signed-off-by: Brian Cavagnolo <brian at cozybit.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

  :000000 100644 0000000... 3224e1b... A  LICENCE.Marvell
  :100644 000000 1fd8766... 0000000... D  LICENCE.libertas
  :100644 000000 3224e1b... 0000000... D  LICENCE.mwl8k
  :100644 100644 d0740ce... 35b82c8... M  WHENCE

Signed-off-by: Peter A. Bigot <pab at pabigot.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../linux-firmware/linux-firmware_git.bb           |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 3825889..1916194 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -21,6 +21,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.radeon;md5=e56b405656593a0c97e478513051ea0e \
                     file://LICENCE.ti-connectivity;md5=186e7a43cf6c274283ad81272ca218ea \
                     file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \
                     file://LICENCE.via_vt6656;md5=e4159694cba42d4377a912e78a6e850f \
+                    file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \
                    "
 
 SRCREV = "c530a75c1e6a472b0eb9558310b518f0dfcd8860"
@@ -95,11 +96,11 @@ FILES_${PN}-ralink = " \
   /lib/firmware/LICENCE.ralink-firmware.txt \
 "
 
-LICENSE_${PN}-sd8686 = "Firmware-libertas"
+LICENSE_${PN}-sd8686 = "Firmware-Marvell"
 FILES_${PN}-sd8686 = " \
   /lib/firmware/libertas/sd8686_v9* \
   /lib/firmware/sd8686* \
-  /lib/firmware/LICENCE.libertas \
+  /lib/firmware/LICENCE.Marvell \
 "
 
 FILES_${PN}-rtl-license = " \