aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorTing Liu <b28495@freescale.com>2013-04-16 11:18:36 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-16 11:38:59 +0100
commitded738b945b6af6c73a1c5f1b4cd5ad1b6ac06c0 (patch)
tree6dbe99ecee8db15d5dfd6faf481aea1c054b289b /meta/recipes-connectivity
parent2d7b2478a3d48a5686afde790c378ee2f69b8e59 (diff)
downloadopenembedded-core-ded738b945b6af6c73a1c5f1b4cd5ad1b6ac06c0.tar.gz
openembedded-core-ded738b945b6af6c73a1c5f1b4cd5ad1b6ac06c0.tar.bz2
openembedded-core-ded738b945b6af6c73a1c5f1b4cd5ad1b6ac06c0.zip
openssl: update range information in man-section.patch
do_patch failed after upgrading to openssl-1.0.1e. Log: | ERROR: Command Error: exit status: 1 Output: | Applying patch man-section.patch | patching file Makefile.org | Hunk #1 succeeded at 160 (offset 26 lines). | Hunk #2 succeeded at 626 (offset 19 lines). | misordered hunks! output would be garbled | Hunk #3 FAILED at 633. | 1 out of 3 hunks FAILED -- rejects in file Makefile.org | Patch man-section.patch does not apply (enforce with -f) | ERROR: Function failed: patch_do_patch | ERROR: Logfile of failure stored in:temp/log.do_patch.14679 | ERROR: Task 646 (virtual:native:openssl_1.0.1e.bb, do_patch) failed with exit code '1' Change-Id: Ib63031fdbd09443e387ee57efa70381e0aca382c Signed-off-by: Ting Liu <b28495@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/man-section.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/man-section.patch
index e8b92681d5..21c1d1a4eb 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/man-section.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/man-section.patch
@@ -4,7 +4,7 @@ Index: openssl-1.0.0c/Makefile.org
===================================================================
--- openssl-1.0.0c.orig/Makefile.org 2010-12-12 16:11:37.000000000 +0100
+++ openssl-1.0.0c/Makefile.org 2010-12-12 16:13:28.000000000 +0100
-@@ -134,7 +134,8 @@
+@@ -160,7 +160,8 @@
MANDIR=/usr/share/man
MAN1=1
MAN3=3
@@ -14,7 +14,7 @@ Index: openssl-1.0.0c/Makefile.org
HTMLSUFFIX=html
HTMLDIR=$(OPENSSLDIR)/html
SHELL=/bin/sh
-@@ -606,7 +607,7 @@
+@@ -651,7 +652,7 @@
echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
(cd `$(PERL) util/dirname.pl $$i`; \
sh -c "$$pod2man \
@@ -23,7 +23,7 @@ Index: openssl-1.0.0c/Makefile.org
--release=$(VERSION) `basename $$i`") \
> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
$(PERL) util/extract-names.pl < $$i | \
-@@ -623,7 +624,7 @@
+@@ -668,7 +669,7 @@
echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
(cd `$(PERL) util/dirname.pl $$i`; \
sh -c "$$pod2man \