[oe-commits] Koen Kooi : openssl 1.0.0e: fix up link patch and make 1.0. 0e the default openssl

[git version control]

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

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Thu Sep 22 09:16:00 2011 +0200

openssl 1.0.0e: fix up link patch and make 1.0.0e the default openssl

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 .../openssl/openssl-1.0.0e/openssl-fix-link.patch  |   27 +++++++++++++------
 .../recipes-connectivity/openssl/openssl_1.0.0e.bb |    4 +--
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch
index 6522d83..154106c 100644
--- a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch
+++ b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch
@@ -1,14 +1,20 @@
-Upstream-Status: Pending
-
-fix the parallel build regarding shared libraries.
+From aabfb6f78af8e337d3239142117ba303fce55e7e Mon Sep 17 00:00:00 2001
+From: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
+Date: Thu, 22 Sep 2011 08:55:26 +0200
+Subject: [PATCH] fix the parallel build regarding shared libraries.
 
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
+Upstream-Status: Pending
+---
+ .../openssl-1.0.0e/Makefile.org                    |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
 
-Index: openssl-1.0.0d/Makefile.org
-===================================================================
---- openssl-1.0.0d.orig/Makefile.org	2011-09-01 17:03:59.000000000 +0400
-+++ openssl-1.0.0d/Makefile.org	2011-09-01 17:12:24.000000000 +0400
-@@ -244,13 +244,13 @@
+diff --git a/Makefile.org
+index 3c7aea1..6326cd6 100644
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -243,13 +243,13 @@ build_libs: build_crypto build_ssl build_engines
+ 
+ build_crypto:
  	@dir=crypto; target=all; $(BUILD_ONE_CMD)
 -build_ssl:
 +build_ssl: build_crypto
@@ -24,3 +30,6 @@ Index: openssl-1.0.0d/Makefile.org
  	@dir=test; target=all; $(BUILD_ONE_CMD)
  build_tools:
  	@dir=tools; target=all; $(BUILD_ONE_CMD)
+-- 
+1.6.6.1
+
diff --git a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb
index 9a22632..bc812d3 100644
--- a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb
+++ b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb
@@ -6,12 +6,10 @@ DEPENDS += "ocf-linux"
 
 CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
-DEFAULT_PREFERENCE = "-1"
-
 export DIRS = "crypto ssl apps engines"
 export OE_LDFLAGS="${LDFLAGS}"