From patchwork Sat Nov 5 17:22:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED,PULL,12/28] libcense.bbclass: fix OpenSSL mapping Date: Sat, 05 Nov 2011 17:22:42 -0000 From: Saul Wold X-Patchwork-Id: 14373 Message-Id: <50f1ebdb9c53d95b74072d2755873fe3ac7d2e78.1320513631.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Martin Jansa [YOCTO #1712] Signed-off-by: Martin Jansa Fixed YOCTO bug format and location Signed-off-by: Saul Wold --- meta/classes/license.bbclass | 2 +- .../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 3f93bf5..baf35f0 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 5add70e..555bacf 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 \