[Pkg-libvirt-commits] [libguestfs] 22/66: appliance: Avoid touching appliance/supermin.d directory.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit 9839af0186b2dbe131ca566a9973ac4c9b61ad60
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Apr 3 16:05:00 2014 +0100

    appliance: Avoid touching appliance/supermin.d directory.
    
    We must avoid touching appliance/supermin.d unless it is necessary, so
    that we avoid unnecessary rebuilds of the full appliance.
    Unfortunately since we created temporary files there, even if we
    didn't decide to keep those temporary files they would still end up
    touching supermin.d.  To stop this, move the temporary files out.
    
    (cherry picked from commit 82b486a9086f84447324d68b3c0cae300e0334f7)
---
 appliance/Makefile.am | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index fac24ed..418a6f6 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -84,17 +84,20 @@ supermin.d/daemon.tar.gz: ../daemon/guestfsd guestfsd.suppressions
 	rm -r tmp-d
 	mv $@-t $@
 
-supermin.d/excludefiles: excludefiles.in Makefile
+# Note we must avoid touching supermin.d if possible, so don't create
+# the temporary files inside the supermin.d directory.
+
+$@supermin.d/excludefiles: excludefiles.in Makefile
 	m4 $(PACKAGELIST_CPP_FLAGS) $< | \
-	grep -v '^[[:space:]]*$$' | grep -v '^#' > $@-t
-	cmp -s $@ $@-t || mv $@-t $@
-	rm -f $@-t
+	grep -v '^[[:space:]]*$$' | grep -v '^#' > excludefiles-t
+	cmp -s $@ excludefiles-t || mv excludefiles-t $@
+	rm -f excludefiles-t
 
 supermin.d/hostfiles: hostfiles.in Makefile
 	m4 $(PACKAGELIST_CPP_FLAGS) $< | \
-	grep -v '^[[:space:]]*$$' | grep -v '^#' > $@-t
-	cmp -s $@ $@-t || mv $@-t $@
-	rm -f $@-t
+	grep -v '^[[:space:]]*$$' | grep -v '^#' > hostfiles-t
+	cmp -s $@ hostfiles-t || mv hostfiles-t $@
+	rm -f hostfiles-t
 
 supermin.d/init.tar.gz: init
 	rm -f $@ $@-t

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git