diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-07-22 16:38:09 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-25 12:54:34 +0100 |
| commit | afa695fd317f5de6cee803091b3c8fb25948237e (patch) | |
| tree | b30b9eb307f7927ad234b797ba94ed550aed6ba1 | |
| parent | d43437307d85c7f0596df6f871a402b948c37223 (diff) | |
| download | 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.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 1c672e109e..da59406aa9 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" | |||
| 7 | LICENSE = "BSD" | 7 | LICENSE = "BSD" |
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045" |
| 9 | 9 | ||
| 10 | PR = "r2" | 10 | PR = "r3" |
| 11 | 11 | ||
| 12 | DEPENDS = "opensp-native sgml-common-native" | 12 | DEPENDS = "opensp-native sgml-common-native" |
| 13 | RDEPENDS_${PN} = "sgml-common" | 13 | RDEPENDS_${PN} = "sgml-common" |
| @@ -31,6 +31,8 @@ CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS', True).replace('--datadir=${datadi | |||
| 31 | CFLAGS =+ "-I${S}/include" | 31 | CFLAGS =+ "-I${S}/include" |
| 32 | 32 | ||
| 33 | SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst" | 33 | SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst" |
| 34 | SYSROOT_PREPROCESS_FUNCS += "openjade_sysroot_preprocess" | ||
| 35 | |||
| 34 | 36 | ||
| 35 | # We need to do this else the source interdependencies aren't generated and | 37 | # We need to do this else the source interdependencies aren't generated and |
| 36 | # build failures can result (e.g. zero size style/Makefile.dep file) | 38 | # build failures can result (e.g. zero size style/Makefile.dep file) |
| @@ -66,8 +68,14 @@ openjade_sstate_postinst() { | |||
| 66 | then | 68 | then |
| 67 | # Ensure that the catalog file sgml-docbook.cat is properly | 69 | # Ensure that the catalog file sgml-docbook.cat is properly |
| 68 | # updated when the package is installed from sstate cache. | 70 | # updated when the package is installed from sstate cache. |
| 69 | install-catalog \ | 71 | ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \ |
| 70 | --add ${sysconfdir}/sgml/sgml-docbook.cat \ | 72 | --add ${sysconfdir}/sgml/sgml-docbook.cat \ |
| 71 | ${sysconfdir}/sgml/openjade-${PV}.cat | 73 | ${sysconfdir}/sgml/openjade-${PV}.cat |
| 72 | fi | 74 | fi |
| 73 | } | 75 | } |
| 76 | |||
| 77 | openjade_sysroot_preprocess () { | ||
| 78 | install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ | ||
| 79 | install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade | ||
| 80 | } | ||
| 81 | |||
