From 82749d923f255f748d10d7206ecc4b0566d879aa Mon Sep 17 00:00:00 2001 From: Graham Gower Date: Tue, 30 Nov 2010 16:54:52 +1030 Subject: [PATCH] openjade_1.3.2.bb: Install catalog with the correct path. Openjade was doing the following: install-catalog: addition of /mnt/oe/tmp/work/x86_64-linux/openjade-native-1.3.2-r4/image/mnt/oe/tmp/sysroots/x86_64-linux/share/sgml/openjade-1.3.2/catalog in /mnt/oe/tmp/sysroots/x86_64-linux/etc/sgml/openjade-1.3.2.cat Which was causing lengthy errors like this one: http://tinderbox.openembedded.org/packages/1149296/ Now I get: install-catalog: addition of /mnt/oe/tmp/sysroots/x86_64-linux/share/sgml/openjade-1.3.2/catalog in /mnt/oe/tmp/sysroots/x86_64-linux/etc/sgml/openjade-1.3.2.cat Signed-off-by: Graham Gower Acked-by: Khem Raj --- recipes/openjade/openjade_1.3.2.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/openjade/openjade_1.3.2.bb b/recipes/openjade/openjade_1.3.2.bb index a84e899d35..6c69173266 100644 --- a/recipes/openjade/openjade_1.3.2.bb +++ b/recipes/openjade/openjade_1.3.2.bb @@ -5,7 +5,7 @@ DESCRIPTION = "OpenJade is a suite of tools for validating, \ processing, and applying DSSSL (Document Style Semantics and \ Specification Language) stylesheets to SGML and XML documents." LICENSE = "BSD" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \ file://configure.patch \ file://autoconf.patch \ @@ -42,8 +42,11 @@ do_install_append () { install -m 644 dsssl/catalog ${D}${datadir}/sgml/openjade-${PV} install -m 644 dsssl/*.{dtd,dsl,sgm} ${D}${datadir}/sgml/openjade-${PV} + # The catalog must live in the sysroot and it must be there for + # install-catalog to do its thing. + install -m 644 dsssl/catalog ${datadir}/sgml/openjade-${PV} install-catalog --add ${sysconfdir}/sgml/openjade-${PV}.cat \ - ${D}${datadir}/sgml/openjade-${PV}/catalog + ${datadir}/sgml/openjade-${PV}/catalog install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat \ ${sysconfdir}/sgml/openjade-${PV}.cat -- 2.39.5