From b4eef2e1bed0536325342ca884ee0905b7e79ada Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 22 Jul 2011 16:38:48 -0700 Subject: docbook-sgml-dtd-native: Add SYSROOT_PREPROCESS_FUNC [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 --- .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc index ede7bb117..542600a78 100644 --- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc +++ b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc @@ -20,9 +20,10 @@ SRC_URI = "http://www.docbook.org/sgml/${DTD_VERSION}/docbook-${DTD_VERSION}.zip # The .zip file extracts to the current dir S = "${WORKDIR}" -INC_PR = "r1" +INC_PR = "r2" SSTATEPOSTINSTFUNCS += "docbook_sgml_dtd_sstate_postinst" +SYSROOT_PREPROCESS_FUNCS += "docbook_sgml_dtd_sysroot_preprocess" inherit native @@ -43,8 +44,14 @@ docbook_sgml_dtd_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-docbook-sgml-dtd-${DTD_VERSION} \ --add ${sysconfdir}/sgml/sgml-docbook.cat \ ${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat fi } + +docbook_sgml_dtd_sysroot_preprocess () { + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-sgml-dtd-${DTD_VERSION} +} + -- cgit v1.2.3