From: Martin Jansa <martin.jansa@gmail.com>
Date: Wed, 2 Nov 2011 12:26:40 +0000 (+0100)
Subject: libcense.bbclass: fix OpenSSL mapping
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc50781c3406578158b4b96b94baad03a8b3b38f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

libcense.bbclass: fix OpenSSL mapping

[YOCTO #1712]

(From OE-Core rev: 56799ebcb5c55a7fc75458fc2be2e69a67e8fd21)

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>
---

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 3f93bf5df22..baf35f00cc4 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -44,7 +44,7 @@ SPDXLICENSEMAP[MPLv1.1] = "MPL-1"
 SPDXLICENSEMAP[MIT-X] = "MIT"
 
 #Openssl variations
-SPDXLICENSEMAP[openssl] = "Openssl"
+SPDXLICENSEMAP[openssl] = "OpenSSL"
 
 #Other variations
 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 5add70eacb9..555bacf86be 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 @@
 require openssl.inc
 
-PR = "r6"
+PR = "r7"
 SRC_URI += "file://debian/ca.patch \
             file://debian/config-hurd.patch;apply=no \
             file://debian/debian-targets.patch \