[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]> --- .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) 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 ede7bb1..542600a 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} +} + -- 1.7.3.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
