[PATCH 0/1] docbook-utils-native fix

[PATCH 0/1] docbook-utils-native fix

[Scott Garman]

From: Scott Garman <scott.a.garman@intel.com>

Hi Saul,

This patch fixes the issues building docbook-utils-native. I'm still working on fixes for docbook-utils and openjade for target installs, but wanted to get you this fix ASAP to resolve the failure on the autobuilder.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: sgarman/docbook-utils-fix
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/docbook-utils-fix

Thanks,
    Scott Garman <scott.a.garman@intel.com>
---


Scott Garman (1):
  docbook-utils: fix build errors

 .../docbook-utils/docbook-utils_0.6.14.bb          |   30 ++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

-- 
1.7.3.5

[PATCH 1/1] docbook-utils: fix build errors

[Scott Garman]

From: Scott Garman <scott.a.garman@intel.com>

Fix build errors found in my first iteration of the recipe.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 .../docbook-utils/docbook-utils_0.6.14.bb          |   30 ++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-devtools/docbook-utils/docbook-utils_0.6.14.bb b/meta/recipes-devtools/docbook-utils/docbook-utils_0.6.14.bb
index 4b053b1..feeb231 100644
--- a/meta/recipes-devtools/docbook-utils/docbook-utils_0.6.14.bb
+++ b/meta/recipes-devtools/docbook-utils/docbook-utils_0.6.14.bb
@@ -17,4 +17,34 @@ SRC_URI[sha256sum] = "48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df
 
 inherit autotools
 
+do_configure_prepend_virtclass-native() {
+	# Fix hard-coded references to /etc/sgml
+	sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" bin/jw.in
+	sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/man/Makefile.am
+	sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/HTML/Makefile.am
+}
+
+do_install_virtclass-native() {
+	install -d ${D}${bindir}
+	# Install the binaries and a bunch of other commonly used names for them.
+	for doctype in html ps dvi man pdf rtf tex texi txt
+	do
+		install -m 0755 ${S}/bin/docbook2$doctype ${D}${bindir}/
+		ln -sf docbook2x-$doctype ${D}${bindir}/db2$doctype
+		ln -sf docbook2$doctype ${D}${bindir}/db2$doctype
+		ln -sf docbook2$doctype ${D}${bindir}/docbook-to-$doctype
+	done
+
+	install -m 0755 ${S}/bin/jw ${D}${bindir}/
+	for i in backends/dvi backends/html backends/man \
+		backends/pdf backends/ps backends/rtf backends/tex \
+		backends/texi backends/txt frontends/docbook \
+		helpers/docbook2man-spec.pl helpers/docbook2texi-spec.pl \
+		docbook-utils.dsl
+	do
+		install -d ${D}${datadir}/sgml/docbook/utils-${PV}/`dirname $i`
+		install ${S}/$i ${D}${datadir}/sgml/docbook/utils-${PV}/$i
+	done
+}
+
 BBCLASSEXTEND = "native"
-- 
1.7.3.5

Re: [PATCH 0/1] docbook-utils-native fix

[Richard Purdie]

On Wed, 2011-02-02 at 19:59 -0800, Scott Garman wrote:
> From: Scott Garman <scott.a.garman@intel.com>
> 
> This patch fixes the issues building docbook-utils-native. I'm still
> working on fixes for docbook-utils and openjade for target installs,
> but wanted to get you this fix ASAP to resolve the failure on the
> autobuilder.
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: sgarman/docbook-utils-fix
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/docbook-utils-fix
> 
> Thanks,
>     Scott Garman <scott.a.garman@intel.com>

Merged into master, thanks Scott.

Cheers,

Richard