[06/17] wireless-tools: Clarify LICENSE field to avoid warnings

Submitted by Richard Purdie on March 13, 2012, 12:22 a.m.

Details

Message ID 04c2e69ffb77b43b853170c2b804eab367260063.1331598077.git.richard.purdie@linuxfoundation.org
State Accepted
Commit 04c2e69ffb77b43b853170c2b804eab367260063
Headers show

Commit Message

Richard Purdie March 13, 2012, 12:22 a.m.
The source is unclear which version of the license applies. Since BSD is listed,
we have plenty of choice so lets pick some versions. Most people would pick
BSD out of the three anyway.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../wireless-tools/wireless-tools_29.bb            |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
index c6235d6..209f29a 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
@@ -1,13 +1,13 @@ 
 DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
 HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
-LICENSE = "GPLv2 & (LGPL | MPL | BSD)"
+LICENSE = "GPLv2 & (LGPLv2.1 | MPL-1.1 | BSD)"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 			file://iwconfig.c;beginline=1;endline=12;md5=cf710eb1795c376eb10ea4ff04649caf \
 			file://iwevent.c;beginline=59;endline=72;md5=d66a10026d4394f0a5b1c5587bce4537 \
 			file://sample_enc.c;beginline=1;endline=4;md5=838372be07874260b566bae2f6ed33b6"
 SECTION = "base"
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \
 	   file://remove.ldconfig.call.patch \