On 07/22/2011 04:57 PM, Joshua Lock wrote:
On Fri, 2011-07-22 at 16:54 -0700, Saul Wold wrote:
[YOCTO #1250]
This added function will install a private install-catalog binary so that
shared state
can find the binary as there is not a guarantee.
Signed-off-by: Saul Wold<[email protected]>
---
.../openjade/openjade-native_1.3.2.bb | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index 1c672e1..3922968 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -7,7 +7,7 @@ SECTION = "base"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
-PR = "r2"
+PR = "r3"
DEPENDS = "opensp-native sgml-common-native"
RDEPENDS_${PN} = "sgml-common"
@@ -31,6 +31,8 @@ CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS',
True).replace('--datadir=${datadi
CFLAGS =+ "-I${S}/include"
SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst"
+SYSROOT_PREPROCESS_FUNCS += "openjade_sysroot_preprocess"
+
# We need to do this else the source interdependencies aren't generated and
# build failures can result (e.g. zero size style/Makefile.dep file)
@@ -66,8 +68,14 @@ openjade_sstate_postinst() {
then
# Ensure that the catalog file sgml-docbook.cat is properly
# updated when the package is installed from sstate cache.
- install-catalog \
+
${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \
--add ${sysconfdir}/sgml/sgml-docbook.cat \
${sysconfdir}/sgml/openjade-${PV}.cat
fi
}
+
+docbook_sgml_dtd_sysroot_preprocess () {
This is not the same function name as above...
Good catch on Johsua's part, Bad on my part for not completing testing
before sending this out. I had a build going before I send the pull
request.
Thanks
Sau!
+ install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+ install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog
${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade
+}
+
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
