diff options
| author | Elizabeth Flanagan <elizabeth.flanagan@intel.com> | 2014-09-25 15:59:56 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-29 12:12:46 +0100 |
| commit | cab81b3418922aac3fc18df6eea025345e873d7c (patch) | |
| tree | ea2cf33b01fd83e9115d43431ef88c1d48de3076 | |
| parent | 215e7b98ae4865b0f24b1cb9c53161fef170b270 (diff) | |
| download | poky-cab81b3418922aac3fc18df6eea025345e873d7c.tar.gz | |
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.
(From OE-Core rev: ed3e7d4a584d836887d798e0f30339808d09804f)
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/nss/nss.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc index d706c43cab..beb2cae3da 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." | |||
| 8 | HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" | 8 | HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" |
| 9 | SECTION = "libs" | 9 | SECTION = "libs" |
| 10 | 10 | ||
| 11 | LICENSE = "MPL-1.1 GPL-2.0 LGPL-2.1" | 11 | LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" |
| 12 | 12 | ||
| 13 | LIC_FILES_CHKSUM = "file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ | 13 | LIC_FILES_CHKSUM = "file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ |
| 14 | file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=6bf96825e3d7ce4de25621ae886cc859" | 14 | file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=6bf96825e3d7ce4de25621ae886cc859" |