Skip to contentSkip to conversation

openjade_1.3.2.bb: Install catalog with the correct path.

PATCH In review Graham Gower 2 participants 2 messages Nov 30, 2010 – Dec 1, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 recipes/openjade/openjade_1.3.2.bb |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
recipes/openjade/openjade_1.3.2.bb +5 -2
index a84e899..6c69173 100644
@@ -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
Signature · 1 line
1.7.1
Acked-by on v1 1/1
#1 lore raw
Quoted 30 lines · Graham Gower

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

---
  recipes/openjade/openjade_1.3.2.bb |    7 +++++--
  1 files changed, 5 insertions(+), 2 deletions(-)
recipes/openjade/openjade_1.3.2.bb +1 -1
index a84e899..6c69173 100644
@@ -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}

recipes/openjade/openjade_1.3.2.bb do_install_append () { · line 52

Quoted 10 lines
recipes/openjade/openjade_1.3.2.bb +4 -1
 
+       # 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

Thanks - I've been running into this for quite some time now with parallel builds and haven't been able to figure out what wasn't being staged properly.

This needs to get into release-2010.12 if someone can cherry-pick it.

Tim