summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb9
-rw-r--r--meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc10
-rw-r--r--meta/recipes-devtools/openjade/openjade-native_1.3.2.bb9
-rw-r--r--meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb17
4 files changed, 34 insertions, 11 deletions
diff --git a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
index d5f5381d72..461b48f4ca 100644
--- a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
+++ b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
@@ -19,6 +19,7 @@ inherit native
19 19
20SSTATEPOSTINSTFUNCS += "docbook_dsssl_stylesheets_sstate_postinst" 20SSTATEPOSTINSTFUNCS += "docbook_dsssl_stylesheets_sstate_postinst"
21SYSROOT_PREPROCESS_FUNCS += "docbook_dsssl_sysroot_preprocess" 21SYSROOT_PREPROCESS_FUNCS += "docbook_dsssl_sysroot_preprocess"
22CLEANFUNCS += "docbook_dsssl_stylesheets_sstate_clean"
22 23
23 24
24do_install () { 25do_install () {
@@ -57,3 +58,11 @@ docbook_dsssl_sysroot_preprocess () {
57 install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl 58 install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl
58} 59}
59 60
61docbook_dsssl_stylesheets_sstate_clean () {
62 # Ensure that the catalog file sgml-docbook.cat is properly
63 # updated when the package is removed from sstate cache.
64 files="${sysconfdir}/sgml/sgml-docbook.bak ${sysconfdir}/sgml/sgml-docbook.cat"
65 for f in $files; do
66 [ ! -f $f ] || sed -i '/\/sgml\/dsssl-docbook-stylesheets.cat/d' $f
67 done
68}
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 b2381bd7d1..af50987968 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
@@ -63,10 +63,8 @@ CLEANFUNCS += "docbook_sgml_dtd_sstate_clean"
63docbook_sgml_dtd_sstate_clean () { 63docbook_sgml_dtd_sstate_clean () {
64 # Ensure that the catalog file sgml-docbook.cat is properly 64 # Ensure that the catalog file sgml-docbook.cat is properly
65 # updated when the package is removed from sstate cache. 65 # updated when the package is removed from sstate cache.
66 if [ -f ${sysconfdir}/sgml/sgml-docbook.bak ]; then 66 files="${sysconfdir}/sgml/sgml-docbook.bak ${sysconfdir}/sgml/sgml-docbook.cat"
67 sed -i '/'"\/sgml\/sgml-docbook-dtd-${DTD_VERSION}.cat"'/d' \ 67 for f in $files; do
68 ${sysconfdir}/sgml/sgml-docbook.bak 68 [ ! -f $f ] || sed -i '/\/sgml\/sgml-docbook-dtd-${DTD_VERSION}.cat/d' $f
69 sed -i '/'"\/sgml\/sgml-docbook-dtd-${DTD_VERSION}.cat"'/d' \ 69 done
70 ${sysconfdir}/sgml/sgml-docbook.cat
71 fi
72} 70}
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 ccce421cf3..fa7aa62eb3 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -40,6 +40,7 @@ CFLAGS =+ "-I${S}/include"
40 40
41SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst" 41SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst"
42SYSROOT_PREPROCESS_FUNCS += "openjade_sysroot_preprocess" 42SYSROOT_PREPROCESS_FUNCS += "openjade_sysroot_preprocess"
43CLEANFUNCS += "openjade_sstate_clean"
43 44
44# configure.in needs to be reloacted to trigger reautoconf 45# configure.in needs to be reloacted to trigger reautoconf
45do_extraunpack () { 46do_extraunpack () {
@@ -97,3 +98,11 @@ openjade_sysroot_preprocess () {
97 install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade 98 install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade
98} 99}
99 100
101openjade_sstate_clean () {
102 # Ensure that the catalog file sgml-docbook.cat is properly
103 # updated when the package is removed from sstate cache.
104 files="${sysconfdir}/sgml/sgml-docbook.bak ${sysconfdir}/sgml/sgml-docbook.cat"
105 for f in $files; do
106 [ ! -f $f ] || sed -i '/\/sgml\/openjade-${PV}.cat/d' $f
107 done
108}
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb b/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb
index af7e104274..597536570d 100644
--- a/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb
+++ b/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb
@@ -22,6 +22,7 @@ S = "${WORKDIR}/sgml-common-${PV}"
22 22
23SYSROOT_PREPROCESS_FUNCS += "sgml_common_native_mangle" 23SYSROOT_PREPROCESS_FUNCS += "sgml_common_native_mangle"
24SSTATEPOSTINSTFUNCS += "sgml_common_sstate_postinst" 24SSTATEPOSTINSTFUNCS += "sgml_common_sstate_postinst"
25CLEANFUNCS += "sgml_common_sstate_clean"
25 26
26 27
27do_install_append() { 28do_install_append() {
@@ -33,9 +34,8 @@ do_install_append() {
33 --add ${D}${sysconfdir}/sgml/sgml-ent.cat \ 34 --add ${D}${sysconfdir}/sgml/sgml-ent.cat \
34 ${D}${datadir}/sgml/sgml-iso-entities-8879.1986/catalog 35 ${D}${datadir}/sgml/sgml-iso-entities-8879.1986/catalog
35 36
36 ${D}${bindir}/install-catalog \ 37 # The sgml-docbook.cat will be regenerated by sstate_postinst
37 --add ${D}${sysconfdir}/sgml/sgml-docbook.cat \ 38 rm -f ${D}${sysconfdir}/sgml/sgml-docbook.cat
38 ${D}${sysconfdir}/sgml/sgml-ent.cat
39} 39}
40 40
41sgml_common_native_mangle () { 41sgml_common_native_mangle () {
@@ -43,8 +43,6 @@ sgml_common_native_mangle () {
43 sed -i -e "s|${D}${sysconfdir}/sgml|${sysconfdir}/sgml|g" ${SYSROOT_DESTDIR}${STAGING_BINDIR}/install-catalog 43 sed -i -e "s|${D}${sysconfdir}/sgml|${sysconfdir}/sgml|g" ${SYSROOT_DESTDIR}${STAGING_BINDIR}/install-catalog
44 # Change path from ${D}${datadir}/sgml/sgml-iso-entities-8879.1986/catalog to ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog in sgml-ent.cat 44 # Change path from ${D}${datadir}/sgml/sgml-iso-entities-8879.1986/catalog to ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog in sgml-ent.cat
45 sed -i -e "s|${D}${datadir}/sgml/sgml-iso-entities-8879.1986/catalog|${datadir}/sgml/sgml-iso-entities-8879.1986/catalog|g" ${SYSROOT_DESTDIR}${sysconfdir}/sgml/sgml-ent.cat 45 sed -i -e "s|${D}${datadir}/sgml/sgml-iso-entities-8879.1986/catalog|${datadir}/sgml/sgml-iso-entities-8879.1986/catalog|g" ${SYSROOT_DESTDIR}${sysconfdir}/sgml/sgml-ent.cat
46 # Change path from ${D}${sysconfdir}/sgml/sgml-ent.cat|${sysconfdir}/sgml/sgml-ent.cat to ${sysconfdir}/sgml/sgml-ent.cat in sgml-ent.cat
47 sed -i -e "s|${D}${sysconfdir}/sgml/sgml-ent.cat|${sysconfdir}/sgml/sgml-ent.cat|g" ${SYSROOT_DESTDIR}${sysconfdir}/sgml/sgml-docbook.cat
48 # Remove ${D} path from catalog file created by install-catalog script 46 # Remove ${D} path from catalog file created by install-catalog script
49 sed -i -e "s|${D}||g" ${SYSROOT_DESTDIR}${sysconfdir}/sgml/catalog 47 sed -i -e "s|${D}||g" ${SYSROOT_DESTDIR}${sysconfdir}/sgml/catalog
50} 48}
@@ -52,6 +50,7 @@ sgml_common_native_mangle () {
52sgml_common_sstate_postinst() { 50sgml_common_sstate_postinst() {
53 if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] 51 if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
54 then 52 then
53 ${bindir}/install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat ${sysconfdir}/sgml/sgml-ent.cat
55 if [ -e ${sysconfdir}/sgml/sgml-docbook.bak ]; then 54 if [ -e ${sysconfdir}/sgml/sgml-docbook.bak ]; then
56 for catalog in `awk '{print $2}' ${sysconfdir}/sgml/sgml-docbook.bak`; do 55 for catalog in `awk '{print $2}' ${sysconfdir}/sgml/sgml-docbook.bak`; do
57 if [ ! `grep $catalog ${sysconfdir}/sgml/sgml-docbook.cat 1> /dev/null 2>&1` ]; then 56 if [ ! `grep $catalog ${sysconfdir}/sgml/sgml-docbook.cat 1> /dev/null 2>&1` ]; then
@@ -62,3 +61,11 @@ sgml_common_sstate_postinst() {
62 fi 61 fi
63 fi 62 fi
64} 63}
64
65sgml_common_sstate_clean () {
66 # Ensure that the catalog file sgml-docbook.cat is properly
67 # updated when the package is removed from sstate cache.
68 if [ -f ${sysconfdir}/sgml/sgml-docbook.cat ]; then
69 sed -i '/\/sgml\/sgml-ent.cat/d' ${sysconfdir}/sgml/sgml-docbook.cat
70 fi
71}