summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-07-22 16:38:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-25 12:54:34 +0100
commitafa695fd317f5de6cee803091b3c8fb25948237e (patch)
treeb30b9eb307f7927ad234b797ba94ed550aed6ba1
parentd43437307d85c7f0596df6f871a402b948c37223 (diff)
downloadast2050-yocto-poky-afa695fd317f5de6cee803091b3c8fb25948237e.zip
ast2050-yocto-poky-afa695fd317f5de6cee803091b3c8fb25948237e.tar.gz
openjade-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. (From OE-Core rev: 188ac8c8fe7a004c576190c42d0f33d00ea88c60) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/openjade/openjade-native_1.3.2.bb12
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..da59406 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
}
+
+openjade_sysroot_preprocess () {
+ install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+ install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade
+}
+
OpenPOWER on IntegriCloud