diff options
author | Ting Liu <b28495@freescale.com> | 2013-04-16 11:18:36 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-16 12:06:50 +0100 |
commit | ec67f99a0852843a63493ac46ed37b032669c1e7 (patch) | |
tree | fd9f0806b607688fdf66e9d47c2dd89894539fde /meta | |
parent | 9fab06175aa6f032ded9c4fe4f50fc7ed7955db8 (diff) | |
download | poky-ec67f99a0852843a63493ac46ed37b032669c1e7.tar.gz |
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
(From OE-Core rev: ded738b945b6af6c73a1c5f1b4cd5ad1b6ac06c0)
Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/man-section.patch | 6 |
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 | |||
4 | =================================================================== | 4 | =================================================================== |
5 | --- openssl-1.0.0c.orig/Makefile.org 2010-12-12 16:11:37.000000000 +0100 | 5 | --- openssl-1.0.0c.orig/Makefile.org 2010-12-12 16:11:37.000000000 +0100 |
6 | +++ openssl-1.0.0c/Makefile.org 2010-12-12 16:13:28.000000000 +0100 | 6 | +++ openssl-1.0.0c/Makefile.org 2010-12-12 16:13:28.000000000 +0100 |
7 | @@ -134,7 +134,8 @@ | 7 | @@ -160,7 +160,8 @@ |
8 | MANDIR=/usr/share/man | 8 | MANDIR=/usr/share/man |
9 | MAN1=1 | 9 | MAN1=1 |
10 | MAN3=3 | 10 | MAN3=3 |
@@ -14,7 +14,7 @@ Index: openssl-1.0.0c/Makefile.org | |||
14 | HTMLSUFFIX=html | 14 | HTMLSUFFIX=html |
15 | HTMLDIR=$(OPENSSLDIR)/html | 15 | HTMLDIR=$(OPENSSLDIR)/html |
16 | SHELL=/bin/sh | 16 | SHELL=/bin/sh |
17 | @@ -606,7 +607,7 @@ | 17 | @@ -651,7 +652,7 @@ |
18 | echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ | 18 | echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ |
19 | (cd `$(PERL) util/dirname.pl $$i`; \ | 19 | (cd `$(PERL) util/dirname.pl $$i`; \ |
20 | sh -c "$$pod2man \ | 20 | sh -c "$$pod2man \ |
@@ -23,7 +23,7 @@ Index: openssl-1.0.0c/Makefile.org | |||
23 | --release=$(VERSION) `basename $$i`") \ | 23 | --release=$(VERSION) `basename $$i`") \ |
24 | > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ | 24 | > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ |
25 | $(PERL) util/extract-names.pl < $$i | \ | 25 | $(PERL) util/extract-names.pl < $$i | \ |
26 | @@ -623,7 +624,7 @@ | 26 | @@ -668,7 +669,7 @@ |
27 | echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ | 27 | echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ |
28 | (cd `$(PERL) util/dirname.pl $$i`; \ | 28 | (cd `$(PERL) util/dirname.pl $$i`; \ |
29 | sh -c "$$pod2man \ | 29 | sh -c "$$pod2man \ |