[oe-commits] Koen Kooi : Revert "openssl: fixup the openssl-fix-link patch"

[git version control]

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

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Sat Sep 17 11:37:41 2011 +0200

Revert "openssl: fixup the openssl-fix-link patch"

openssl-fix-link.patch fails to apply

This reverts commit 3f546ada2c5baeea4d0fe6d4dd73797cdefa73da.

---

 .../openssl/openssl-1.0.0e/openssl-fix-link.patch  |   14 +++++---------
 .../recipes-connectivity/openssl/openssl_1.0.0e.bb |    2 +-
 2 files changed, 6 insertions(+), 10 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 15762a7..b319c62 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
@@ -8,19 +8,15 @@ 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 @@
+@@ -246,9 +246,9 @@
 	@dir=crypto; target=all; $(BUILD_ONE_CMD)
--build_ssl:
-+build_ssl: build_crypto
+ build_ssl:
 	@dir=ssl; target=all; $(BUILD_ONE_CMD)
 -build_engines:
 +build_engines: build_crypto
 	@dir=engines; target=all; $(BUILD_ONE_CMD)
 -build_apps:
-+build_apps: build_crypto build_ssl
++build_apps: build_crypto
 	@dir=apps; target=all; $(BUILD_ONE_CMD)
--build_tests:
-+build_tests: build_crypto build_ssl
- 	@dir=test; target=all; $(BUILD_ONE_CMD)
- build_tools:
- 	@dir=tools; target=all; $(BUILD_ONE_CMD)
+ build_tests:
+	@dir=test; target=all; $(BUILD_ONE_CMD)
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..28039ca 100644
--- a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb
+++ b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb
@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux"
 
 CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"