All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] docbook-utils-native: Fix re-execution of the unpack task
@ 2012-04-16 10:05 Richard Purdie
  0 siblings, 0 replies; only message in thread
From: Richard Purdie @ 2012-04-16 10:05 UTC (permalink / raw)
  To: openembedded-core

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]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
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
 
 do_configure_prepend() {
 	# Fix hard-coded references to /etc/sgml
-	if [ ! -e ${WORKDIR}/.sed_done ]; then
+	if [ ! -e ${S}/.sed_done ]; then
 		sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" bin/jw.in
 		sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/man/Makefile.am
 		sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/HTML/Makefile.am
 
 		# Point jw to the native sysroot catalog
 		sed -i -e 's|^SGML_EXTRA_CATALOGS=""|SGML_EXTRA_CATALOGS=":${sysconfdir}/sgml/catalog"|g' bin/jw.in
-		touch ${WORKDIR}/.sed_done
+		touch ${S}/.sed_done
 	fi
 }
+do_unpack[cleandirs] += "${S}"
 
 do_install() {
 	install -d ${D}${bindir}





^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2012-04-16 10:14 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-16 10:05 [PATCH] docbook-utils-native: Fix re-execution of the unpack task Richard Purdie

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.