From: Zhai Edwin <[email protected]> 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. Signed-off-by: Zhai Edwin <[email protected]> CC: Saul Would <[email protected]> --- meta/recipes-devtools/opensp/opensp_1.5.bb | 4 +- .../iputils/files/nsgmls-path-fix.patch | 27 ++++++++++++++++++++ meta/recipes-extended/iputils/iputils_s20101006.bb | 1 + 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/iputils/files/nsgmls-path-fix.patch diff --git a/meta/recipes-devtools/opensp/opensp_1.5.bb b/meta/recipes-devtools/opensp/opensp_1.5.bb index 0269c87..d692137 100644 --- a/meta/recipes-devtools/opensp/opensp_1.5.bb +++ b/meta/recipes-devtools/opensp/opensp_1.5.bb @@ -44,8 +44,8 @@ do_install_append() { do_install_append_virtclass-native() { for util in nsgmls sgmlnorm spam spcat spent sx; do - create_wrapper ${D}/${bindir}/$util \ - SGML_CATALOG_FILES=${sysconfdir}/sgml/catalog + create_cmdline_wrapper ${D}/${bindir}/$util \ + -D ${sysconfdir}/sgml done } 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 0000000..92bf946 --- /dev/null +++ b/meta/recipes-extended/iputils/files/nsgmls-path-fix.patch @@ -0,0 +1,27 @@ +Fix nsgmls path issue + +Upstream-Status: Pending + +Signed-off-by: Zhai Edwin <[email protected]> + +Index: iputils-s20101006/doc/Makefile +=================================================================== +--- iputils-s20101006.orig/doc/Makefile 2011-09-13 20:42:27.000000000 +0800 ++++ iputils-s20101006/doc/Makefile 2011-09-13 21:01:52.000000000 +0800 +@@ -27,10 +27,15 @@ + # docbook2man produces utterly ugly output and I did not find + # any way to customize this but hacking backend perl script a little. + # Well, hence... ++# nsgmls seems append path to search directory according to the sysid path. ++# e.g. if input ../index.db, it would search $search_directory/../ rather than ++# $search_directory, which leads searching failure. Fixing nsgmls probably ++# introduce some side effects, so use this ugly hack: running nsgmls in current ++# directory, and running docbook2man in tmp directory. + + $(MANFILES): index.db + @-mkdir tmp.db2man +- @set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ; mv $@ .. ++ @set -e; nsgmls $< >tmp.db2man/output; cd tmp.db2man; cat output | sgmlspl ../docbook2man-spec.pl ; mv $@ .. + @-rm -rf tmp.db2man + + clean: diff --git a/meta/recipes-extended/iputils/iputils_s20101006.bb b/meta/recipes-extended/iputils/iputils_s20101006.bb index c97fce7..5216c10 100644 --- a/meta/recipes-extended/iputils/iputils_s20101006.bb +++ b/meta/recipes-extended/iputils/iputils_s20101006.bb @@ -21,6 +21,7 @@ SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \ file://debian/use_gethostbyname2.diff \ file://debian/targets.diff \ file://debian/fix-arping-timeouts.diff \ + file://nsgmls-path-fix.patch \ " SRC_URI[md5sum] = "a36c25e9ec17e48be514dc0485e7376c" -- 1.7.1 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
