[oe-commits] Elizabeth Flanagan : nss.inc: Fix LICENSE

[git at git.openembedded.org]

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

Author: Elizabeth Flanagan <elizabeth.flanagan at intel.com>
Date:   Thu Sep 25 15:59:56 2014 -0700

nss.inc: Fix LICENSE

>From reading the COPYING and various license headers, the nss
LICENSE was incorrect. It's actually MPL-2.0 (not 1.1) with a
few different Or instances.

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-support/nss/nss.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc
index d706c43..beb2cae 100644
--- a/meta/recipes-support/nss/nss.inc
+++ b/meta/recipes-support/nss/nss.inc
@@ -8,7 +8,7 @@ v3 certificates, and other security standards."
 HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/"
 SECTION = "libs"
 
-LICENSE = "MPL-1.1 GPL-2.0 LGPL-2.1"
+LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)"
 
 LIC_FILES_CHKSUM = "file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \
                     file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=6bf96825e3d7ce4de25621ae886cc859"