summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-07-22 16:38:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-25 12:38:42 +0100
commitb4eef2e1bed0536325342ca884ee0905b7e79ada (patch)
treef954457bc29ec24bbe8cb386f5eb21926513ad4d /meta
parent188ac8c8fe7a004c576190c42d0f33d00ea88c60 (diff)
downloadopenembedded-core-b4eef2e1bed0536325342ca884ee0905b7e79ada.tar.gz
openembedded-core-b4eef2e1bed0536325342ca884ee0905b7e79ada.tar.bz2
openembedded-core-b4eef2e1bed0536325342ca884ee0905b7e79ada.tar.xz
openembedded-core-b4eef2e1bed0536325342ca884ee0905b7e79ada.zip
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 <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc11
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 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}
+}
+