diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-09-17 11:37:41 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-09-17 11:37:41 +0200 |
commit | 3b4eaac526aba9ac627e19186c3cd1a90a930a9b (patch) | |
tree | c5712428a292f6fe0a5778a13d2606d7b737075c /meta-oe/recipes-connectivity/openssl | |
parent | e8e41e3aa8be823f849e64717cb423c69135e07f (diff) | |
download | meta-openembedded-contrib-3b4eaac526aba9ac627e19186c3cd1a90a930a9b.tar.gz |
Revert "openssl: fixup the openssl-fix-link patch"
openssl-fix-link.patch fails to apply
This reverts commit 3f546ada2c5baeea4d0fe6d4dd73797cdefa73da.
Diffstat (limited to 'meta-oe/recipes-connectivity/openssl')
-rw-r--r-- | meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch | 14 | ||||
-rw-r--r-- | meta-oe/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 15762a706c..b319c62f42 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 9a22632bbe..28039ca97b 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" |