diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2011-11-02 13:26:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:38:10 +0000 |
commit | b6312e2d513c09c6e61ad27d3feac962c6ae3e84 (patch) | |
tree | 87baa2ad141939ef333a0b596aeeb29145c059db | |
parent | 5a41a612c905d45767021392d9db9e43e7b5588e (diff) | |
download | poky-b6312e2d513c09c6e61ad27d3feac962c6ae3e84.tar.gz |
libcense.bbclass: fix OpenSSL mapping
[YOCTO #1712]
(From OE-Core rev: 56799ebcb5c55a7fc75458fc2be2e69a67e8fd21)
(From OE-Core rev: efb4527ff527d3e465df2a21fdfda110542b70b5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Fixed YOCTO bug format and location
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/license.bbclass | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_0.9.8r.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 3f93bf5df2..baf35f00cc 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -44,7 +44,7 @@ SPDXLICENSEMAP[MPLv1.1] = "MPL-1" | |||
44 | SPDXLICENSEMAP[MIT-X] = "MIT" | 44 | SPDXLICENSEMAP[MIT-X] = "MIT" |
45 | 45 | ||
46 | #Openssl variations | 46 | #Openssl variations |
47 | SPDXLICENSEMAP[openssl] = "Openssl" | 47 | SPDXLICENSEMAP[openssl] = "OpenSSL" |
48 | 48 | ||
49 | #Other variations | 49 | #Other variations |
50 | SPDXLICENSEMAP[AFL2.1] = "AFL-2" | 50 | SPDXLICENSEMAP[AFL2.1] = "AFL-2" |
diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb index 5add70eacb..555bacf86b 100644 --- a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb +++ b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require openssl.inc | 1 | require openssl.inc |
2 | 2 | ||
3 | PR = "r6" | 3 | PR = "r7" |
4 | SRC_URI += "file://debian/ca.patch \ | 4 | SRC_URI += "file://debian/ca.patch \ |
5 | file://debian/config-hurd.patch;apply=no \ | 5 | file://debian/config-hurd.patch;apply=no \ |
6 | file://debian/debian-targets.patch \ | 6 | file://debian/debian-targets.patch \ |