From 1b60344e672e4fc233d7fe6b8ecfcda46a40f4d5 Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Fri, 20 Nov 2009 18:43:20 +0000 Subject: [PATCH] build: Ensure building appliance depends on guestfsd Previously, only the update.sh rule checked the daemon had been built. update.sh is called directly from within make.sh, so in that path the dependency was never checked. This adds the daemon dependency explicitly to the rebuild-from-scratch path. --- appliance/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appliance/Makefile.am b/appliance/Makefile.am index bf1183d..abb5086 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -59,7 +59,7 @@ endif # This is for building the normal appliance: $(INITRAMFSIMG) $(VMLINUZ): $(top_builddir)/initramfs/fakeroot.log -$(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist +$(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist $(top_builddir)/daemon/guestfsd mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak 2>/dev/null; : mv $(VMLINUZ) $(VMLINUZ).bak 2>/dev/null; : if ! bash make.sh; then rm -f $@; exit 1; fi -- 1.8.3.1