summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 10:05:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 11:52:10 (GMT)
commit388bae1ac8df4baf5f9255917768314c9f833b03 (patch)
treed9833b4652f1944637824706816688928559943c /meta/recipes-devtools
parent23f4288082a381eb3141244622b8de6ef0d6d01e (diff)
downloadpoky-388bae1ac8df4baf5f9255917768314c9f833b03.tar.gz
docbook-utils-native: Fix re-execution of the unpack task
If the do_unpack task is re-executed, the sed_done stamp was not removed, the sed commands wouldn't re-run and the build would fail in do_compile. This patch ensures the stamp is in ${S} and that we clean that directory when unpack runs so it is a build from sctatch at that point. [YOCTO #2194] (From OE-Core rev: 2b190155d74d4369c61d26b1f4f0c3cce389ddbc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb b/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
index 2a89479..5e1384d 100644
--- a/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
+++ b/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
@@ -21,16 +21,17 @@ inherit autotools native
21 21
22do_configure_prepend() { 22do_configure_prepend() {
23 # Fix hard-coded references to /etc/sgml 23 # Fix hard-coded references to /etc/sgml
24 if [ ! -e ${WORKDIR}/.sed_done ]; then 24 if [ ! -e ${S}/.sed_done ]; then
25 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" bin/jw.in 25 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" bin/jw.in
26 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/man/Makefile.am 26 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/man/Makefile.am
27 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/HTML/Makefile.am 27 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/HTML/Makefile.am
28 28
29 # Point jw to the native sysroot catalog 29 # Point jw to the native sysroot catalog
30 sed -i -e 's|^SGML_EXTRA_CATALOGS=""|SGML_EXTRA_CATALOGS=":${sysconfdir}/sgml/catalog"|g' bin/jw.in 30 sed -i -e 's|^SGML_EXTRA_CATALOGS=""|SGML_EXTRA_CATALOGS=":${sysconfdir}/sgml/catalog"|g' bin/jw.in
31 touch ${WORKDIR}/.sed_done 31 touch ${S}/.sed_done
32 fi 32 fi
33} 33}
34do_unpack[cleandirs] += "${S}"
34 35
35do_install() { 36do_install() {
36 install -d ${D}${bindir} 37 install -d ${D}${bindir}