diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2011-09-13 17:02:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-13 17:06:17 +0100 |
commit | cba78fed34318bc1fda2af11e85aebb0467948a8 (patch) | |
tree | 8e316075056789f52113c9f2aba5de161ade450f /meta/recipes-extended/iputils/files | |
parent | 20dbf0024385eaef61a04d8773fd7640e3c8cc6d (diff) | |
download | poky-cba78fed34318bc1fda2af11e85aebb0467948a8.tar.gz |
opensp: Fix hard path in native nsgmls.
This relocation issues caused following bug and introduce one partial fix bb024d:
[YOCTO #1440]
But the environment val hacking is not working all the time, as nsgmsl may
append wrong path in some case. This fix use search directory "-D" as solution.
And more important, change the iputils' way to make doc: Use the sysid in
current directory instead of parent directory, as "../" is also appended to the
search directory then lead searching failure.
(From OE-Core rev: a5aeb873b943300e18493031ffa9e9f8ab56c2d2)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
CC: Saul Would <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iputils/files')
-rw-r--r-- | meta/recipes-extended/iputils/files/nsgmls-path-fix.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-extended/iputils/files/nsgmls-path-fix.patch b/meta/recipes-extended/iputils/files/nsgmls-path-fix.patch new file mode 100644 index 0000000000..92bf946f2a --- /dev/null +++ b/meta/recipes-extended/iputils/files/nsgmls-path-fix.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | Fix nsgmls path issue | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
6 | |||
7 | Index: iputils-s20101006/doc/Makefile | ||
8 | =================================================================== | ||
9 | --- iputils-s20101006.orig/doc/Makefile 2011-09-13 20:42:27.000000000 +0800 | ||
10 | +++ iputils-s20101006/doc/Makefile 2011-09-13 21:01:52.000000000 +0800 | ||
11 | @@ -27,10 +27,15 @@ | ||
12 | # docbook2man produces utterly ugly output and I did not find | ||
13 | # any way to customize this but hacking backend perl script a little. | ||
14 | # Well, hence... | ||
15 | +# nsgmls seems append path to search directory according to the sysid path. | ||
16 | +# e.g. if input ../index.db, it would search $search_directory/../ rather than | ||
17 | +# $search_directory, which leads searching failure. Fixing nsgmls probably | ||
18 | +# introduce some side effects, so use this ugly hack: running nsgmls in current | ||
19 | +# directory, and running docbook2man in tmp directory. | ||
20 | |||
21 | $(MANFILES): index.db | ||
22 | @-mkdir tmp.db2man | ||
23 | - @set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ; mv $@ .. | ||
24 | + @set -e; nsgmls $< >tmp.db2man/output; cd tmp.db2man; cat output | sgmlspl ../docbook2man-spec.pl ; mv $@ .. | ||
25 | @-rm -rf tmp.db2man | ||
26 | |||
27 | clean: | ||